UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

第三方单据类型，领用单据徐选入

Browse Source
master
anthonywj 2 years ago
parent 9ed9b7ec47
commit d6abb99481
16 changed files with 274 additions and 105 deletions
Show Stats Download Patch File Download Diff File

115
src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
Unescape Escape View File

@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.Constant;
@ -13,25 +14,31 @@ import com.glxp.api.controller.BaseController;
import com.glxp.api.dao.inout.IoOrderDetailBizDao;
import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.auth.InvWarehouseEntity;
import com.glxp.api.entity.basic.BasicBusTypeChangeEntity;
import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
import com.glxp.api.entity.inout.IoOrderEntity;
import com.glxp.api.entity.basic.UdiRelevanceEntity;
import com.glxp.api.entity.inout.*;
import com.glxp.api.entity.thrsys.ThrOrderDetailEntity;
import com.glxp.api.entity.thrsys.ThrOrderEntity;
import com.glxp.api.req.inout.AddBizProductReqeust;
import com.glxp.api.req.inout.AddThrOrderRequest;
import com.glxp.api.req.inout.FilterOrderDetailBizRequest;
import com.glxp.api.req.inout.FilterOrderRequest;
import com.glxp.api.req.system.DeleteRequest;
import com.glxp.api.req.thrsys.FilterThrOrderDetailRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.basic.UdiRelevanceResponse;
import com.glxp.api.res.inout.IoOrderDetailBizResponse;
import com.glxp.api.service.auth.InvWarehouseService;
import com.glxp.api.service.basic.IBasicBusTypeChangeService;
import com.glxp.api.service.basic.IBasicBussinessTypeService;
import com.glxp.api.service.basic.UdiRelevanceService;
import com.glxp.api.service.inout.IoCheckInoutService;
import com.glxp.api.service.inout.IoOrderDetailBizService;
import com.glxp.api.service.inout.IoOrderDetailCodeService;
import com.glxp.api.service.inout.IoOrderService;
import com.glxp.api.service.inout.*;
import com.glxp.api.service.thrsys.ThrOrderService;
import com.glxp.api.util.GennerOrderUtils;
import com.glxp.api.util.OrderNoTypeBean;
import org.springframework.beans.BeanUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@ -158,6 +165,100 @@ public class IoOrderDetailBizController extends BaseController {
return orderDetailBizService.update(orderDetailBizEntity) > 0 ? ResultVOUtils.success("保存成功！") : ResultVOUtils.error(500, "保存失败");
}
@Resource
ThrOrderService thrOrderService;
//选入第三方单据至业务单据
@AuthRuleAnnotation("")
@PostMapping("/udiwms/inout/order/addThrOrder")
public BaseResponse addThrOrder(@RequestBody AddThrOrderRequest addThrOrderRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
ThrOrderEntity thrOrderEntity = thrOrderService.findById(addThrOrderRequest.getThrOrderId());
if (thrOrderEntity == null) {
return ResultVOUtils.error(ResultEnum.DATA_NOT);
}
AuthAdmin authAdmin = getUser();
//创建单据
IoOrderEntity orderEntity = new IoOrderEntity();
// String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(bussinessTypeEntity.getPrefix()), "yyyyMMdd"));
// orderEntity.setBillNo(orderNo);
orderEntity.setCreateUser(authAdmin.getId() + "");
orderEntity.setCreateTime(new Date());
//todo 单据类型逻辑有误，暂不处理
thrOrderService.updateThrOrder(thrOrderEntity);
return ResultVOUtils.success();
}
@Resource
ReceiveService receiveService;
@Resource
ReceivedetailService receivedetailService;
@Resource
IBasicBusTypeChangeService basicBusTypeChangeService;
//选入领用单据至业务单据
@AuthRuleAnnotation("")
@PostMapping("/udiwms/inout/order/addReceiveOrder")
public BaseResponse addReceiveOrder(@RequestBody PurReceiveEntity purReceiveEntity,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
purReceiveEntity = receiveService.selectById(purReceiveEntity.getId());
List<PurReceiveDetailEntity> purReceiveDetailEntities = receivedetailService.selectByOrderId(purReceiveEntity.getBillNo());
BasicBusTypeChangeEntity basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(purReceiveEntity.getBillType());
BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(basicBusTypeChangeEntity.getTargetAction());
AuthAdmin authAdmin = getUser();
//创建单据
IoOrderEntity orderEntity = new IoOrderEntity();
String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(bussinessTypeEntity.getPrefix()), "yyyyMMdd"));
orderEntity.setBillNo(orderNo);
orderEntity.setCreateUser(authAdmin.getId() + "");
orderEntity.setCreateTime(new Date());
orderEntity.setUpdateUser(authAdmin.getId() + "");
orderEntity.setUpdateTime(new Date());
orderEntity.setCustomerId(authAdmin.getCustomerId() + "");
orderEntity.setAction(bussinessTypeEntity.getAction());
orderEntity.setMainAction(bussinessTypeEntity.getMainAction());
orderEntity.setDeptCode(purReceiveEntity.getTargetDeptCode());
orderEntity.setInvCode(purReceiveEntity.getTargetInvCode());
orderEntity.setFromReceiveBillNo(purReceiveEntity.getBillNo());
orderService.insertOrder(orderEntity);
for (PurReceiveDetailEntity purReceiveDetailEntity : purReceiveDetailEntities) {
IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(purReceiveDetailEntity.getRelIdFk());
ioOrderDetailBizEntity.setOrderIdFk(orderEntity.getBillNo());
ioOrderDetailBizEntity.setBindRlFk(udiRelevanceResponse.getId());
ioOrderDetailBizEntity.setUuidFk(udiRelevanceResponse.getUuid());
ioOrderDetailBizEntity.setNameCode(udiRelevanceResponse.getNameCode());
ioOrderDetailBizEntity.setCoName(udiRelevanceResponse.getCpmctymc());
ioOrderDetailBizEntity.setCertCode(udiRelevanceResponse.getZczbhhzbapzbh());
ioOrderDetailBizEntity.setYlqxzcrbarmc(udiRelevanceResponse.getYlqxzcrbarmc());
ioOrderDetailBizEntity.setManufacturer(udiRelevanceResponse.getManufactory());
ioOrderDetailBizEntity.setMeasname(udiRelevanceResponse.getMeasname());
ioOrderDetailBizEntity.setSpec(udiRelevanceResponse.getGgxh());
ioOrderDetailBizEntity.setPrice(udiRelevanceResponse.getPrice());
ioOrderDetailBizEntity.setProductDate(purReceiveDetailEntity.getProductDate());
ioOrderDetailBizEntity.setExpireDate(purReceiveDetailEntity.getExpireDate());
ioOrderDetailBizEntity.setBatchNo(purReceiveDetailEntity.getBatchNo());
ioOrderDetailBizEntity.setSupId(purReceiveDetailEntity.getSupId());
orderDetailBizService.insert(ioOrderDetailBizEntity);
}
return ResultVOUtils.success();
}
@AuthRuleAnnotation("")
@PostMapping("/udiwms/inout/order/delBizProduct")
public BaseResponse delBizProduct(@RequestBody DeleteRequest deleteRequest) {

32
src/main/java/com/glxp/api/controller/inout/ThrOrderReceiveController.java → src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.glxp.api.controller.inout;
package com.glxp.api.controller.purchase;
//领用单
import cn.hutool.core.collection.CollUtil;
@ -9,11 +9,9 @@ import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.Constant;
import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.auth.InvWarehouseEntity;
import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
import com.glxp.api.entity.inout.PurReceiveDetailEntity;
import com.glxp.api.entity.inout.PurReceiveEntity;
import com.glxp.api.req.inout.AddReceiveDetailRequest;
@ -40,7 +38,7 @@ import java.util.Date;
import java.util.List;
@RestController
public class ThrOrderReceiveController extends BaseController {
public class PurOrderReceiveController extends BaseController {
@Resource
@ -167,11 +165,11 @@ public class ThrOrderReceiveController extends BaseController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
boolean falg=receivedetailService.updateReceiveDetail(updateReceiveDetailRequest);
if(falg){
boolean falg = receivedetailService.updateReceiveDetail(updateReceiveDetailRequest);
if (falg) {
return ResultVOUtils.success();
}else{
return ResultVOUtils.error(555,"更新失败！");
} else {
return ResultVOUtils.error(555, "更新失败！");
}
}
@ -179,11 +177,11 @@ public class ThrOrderReceiveController extends BaseController {
@AuthRuleAnnotation("")
@GetMapping("/udiwms/receive/order/del")
public BaseResponse del(String orderIdFk) {
boolean falg=receiveService.delReceive(orderIdFk);
if(falg){
boolean falg = receiveService.delReceive(orderIdFk);
if (falg) {
return ResultVOUtils.success();
}else{
return ResultVOUtils.error(555,"删除失败！");
} else {
return ResultVOUtils.error(555, "删除失败！");
}
}
@ -191,11 +189,11 @@ public class ThrOrderReceiveController extends BaseController {
@GetMapping("/udiwms/receive/detail/delReceiveDetail")
public BaseResponse delReceiveDetail(Integer id) {
boolean falg=receivedetailService.delDetail(id+"");
if(falg){
boolean falg = receivedetailService.delDetail(id + "");
if (falg) {
return ResultVOUtils.success();
}else{
return ResultVOUtils.error(555,"删除失败！");
} else {
return ResultVOUtils.error(555, "删除失败！");
}
}
@ -211,7 +209,7 @@ public class ThrOrderReceiveController extends BaseController {
purReceiveEntity.setUpdateUser(userId + "");
purReceiveEntity.setAuditRemark(purReceiveEntity.getAuditRemark());
purReceiveEntity.setAuditTime(new Date());
purReceiveEntity.setAuditUser(userId+"");
purReceiveEntity.setAuditUser(userId + "");
purReceiveEntity.setUpdateTime(new Date());
receiveService.updateOrder(purReceiveEntity);
return ResultVOUtils.success("成功");

10
src/main/java/com/glxp/api/controller/thrsys/ThrBusTypeOriginController.java
Unescape Escape View File

@ -59,10 +59,14 @@ public class ThrBusTypeOriginController {
if (filterThrBusTypeOriginRequest.isOnlyMain()) {
ThrSystemEntity thrSystemEntity = thrSystemService.selectMainThrSys();
filterThrBusTypeOriginRequest.setThirdSys(thrSystemEntity.getThirdId());
} else if (StrUtil.isEmpty(filterThrBusTypeOriginRequest.getThirdSys())) {
ThrSystemEntity thrSystemEntity = thrSystemService.selectMainThrSys();
filterThrBusTypeOriginRequest.setThirdSys(thrSystemEntity.getThirdId());
}
/**
* else if (StrUtil.isEmpty(filterThrBusTypeOriginRequest.getThirdSys())) {
* ThrSystemEntity thrSystemEntity = thrSystemService.selectMainThrSys();
* filterThrBusTypeOriginRequest.setThirdSys(thrSystemEntity.getThirdId());
* }
*/
List<ThrBusTypeOriginEntity> thrBusTypeOriginEntityEntities = thrBusTypeOriginService.filterEnableList(filterThrBusTypeOriginRequest);
PageInfo<ThrBusTypeOriginEntity> pageInfo = new PageInfo<>(thrBusTypeOriginEntityEntities);
return ResultVOUtils.page(pageInfo);

7
src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java
Unescape Escape View File

@ -188,11 +188,18 @@ public class IoOrderEntity {
@TableField(value = "entrustEnd")
private boolean entrustEnd;
/**
* 单据类型：1.业务单据，2:扫码单据,3.正常处理单据 只有草稿，异常，待处理
*/
@TableField(value = "orderType")
private Integer orderType;
@TableField(value = "fromReceiveBillNo")
private String fromReceiveBillNo;
@TableField(value = "fromThrBillNo")
private String fromThrBillNo;
}

31
src/main/java/com/glxp/api/entity/thrsys/ThrBusTypeOriginEntity.java
Unescape Escape View File

@ -41,12 +41,6 @@ public class ThrBusTypeOriginEntity {
@TableField(value = "thirdSys")
private String thirdSys;
/**
* 第三方系统名称
*/
@TableField(value = "thirdSysName")
private String thirdSysName;
/**
* 0:启用；1:禁用
*/
@ -89,27 +83,4 @@ public class ThrBusTypeOriginEntity {
@TableField(value = "createTime")
private Date createTime;
// public static final String COL_ID = "id";
//
// public static final String COL_NAME = "name";
//
// public static final String COL_ACTION = "action";
//
// public static final String COL_THIRDSYS = "thirdSys";
//
// public static final String COL_THIRDSYSNAME = "thirdSysName";
//
// public static final String COL_ENABLE = "enable";
//
// public static final String COL_INOUTTYPE = "inoutType";
//
// public static final String COL_UPDATETIME = "updateTime";
//
// public static final String COL_REMARK = "remark";
//
// public static final String COL_CREATEUSER = "createUser";
//
// public static final String COL_UPDATEUSER = "updateUser";
//
// public static final String COL_CREATETIME = "createTime";
}
}

12
src/main/java/com/glxp/api/req/inout/AddThrOrderRequest.java
Unescape Escape View File

@ -0,0 +1,12 @@
package com.glxp.api.req.inout;
import lombok.Data;
@Data
public class AddThrOrderRequest {
private String thrOrderId;
private String invCode;
private String deptCode;
}

4
src/main/java/com/glxp/api/res/inout/IoOrderResponse.java
Unescape Escape View File

@ -204,12 +204,12 @@ public class IoOrderResponse {
* 单据类型：1.业务单据，2:扫码单据,3.正常处理单据 只有草稿，异常，待处理
*/
private Integer orderType;
private Integer fromReceiveBillNo;
private Integer fromThrBillNo;
//是否可以补单
private boolean enableSupplementOrder;
public String getFromName() {
if (StrUtil.isNotEmpty(fromCorpName))

63
src/main/java/com/glxp/api/res/thrsys/ThrBusTypeOriginResponse.java
Unescape Escape View File

@ -1,10 +1,73 @@
package com.glxp.api.res.thrsys;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import java.util.Date;
/**
* 第三方单据类型接口响应VO
*/
@Data
public class ThrBusTypeOriginResponse {
/**
* id
*/
private Integer id;
/**
* 单据类型名称
*/
private String name;
/**
* 单据类型编码
*/
private String action;
/**
* 第三方系统标识
*/
private String thirdSys;
private String thirdSysName;
/**
* 0:启用；1:禁用
*/
private Boolean enable;
/**
* 出入库类型
*/
private Integer inoutType;
/**
* 更新时间
*/
private Date updateTime;
/**
* 备注
*/
private String remark;
/**
* 创建人
*/
private String createUser;
/**
* 更新人
*/
private String updateUser;
/**
* 创建时间
*/
private Date createTime;
}

3
src/main/java/com/glxp/api/service/basic/IBasicBusTypeChangeService.java
Unescape Escape View File

@ -11,6 +11,9 @@ import java.util.List;
*/
public interface IBasicBusTypeChangeService {
BasicBusTypeChangeEntity selectByOriginAction(String action);
/**
* 查询单据生成设置列表
*

5
src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java
Unescape Escape View File

@ -28,6 +28,11 @@ public class BasicBusTypeChangeServiceImpl implements IBasicBusTypeChangeService
@Resource
private BasicBusTypeChangeDao basicBusTypeChangeDao;
@Override
public BasicBusTypeChangeEntity selectByOriginAction(String action) {
return basicBusTypeChangeDao.selectOne(new QueryWrapper<BasicBusTypeChangeEntity>().eq("originAction", action));
}
@Override
public List<BasicBusTypeChangeResponse> filterList(FilterBusTypeChangeRequest filterBusTypeChangeRequest) {
if (null == filterBusTypeChangeRequest) {

5
src/main/java/com/glxp/api/service/inout/ReceiveService.java
Unescape Escape View File

@ -1,12 +1,9 @@
package com.glxp.api.service.inout;
import com.glxp.api.dao.inout.ReceiveDao;
import com.glxp.api.entity.inout.IoOrderEntity;
import com.glxp.api.entity.inout.PurReceiveEntity;
import com.glxp.api.req.inout.FilterReceiveRequest;
import com.glxp.api.res.inout.ReceiveResponse;
import javax.annotation.Resource;
import java.util.List;
/**
@ -14,6 +11,8 @@ import java.util.List;
*/
public interface ReceiveService {
PurReceiveEntity selectById(Long id);
int insertOrder(PurReceiveEntity purReceiveEntity);
int updateOrder(PurReceiveEntity purReceiveEntity);

3
src/main/java/com/glxp/api/service/inout/ReceivedetailService.java
Unescape Escape View File

@ -11,6 +11,9 @@ import java.util.List;
public interface ReceivedetailService {
List<PurReceiveDetailEntity> selectByOrderId(String orderId);
List<ReceiveDetailResponse> filterList(FilterReceiveDetailRequest filterReceiveDetailRequest);
int insert(PurReceiveDetailEntity receiveDetailEntity);

7
src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java
Unescape Escape View File

@ -21,6 +21,11 @@ public class ReceiveDetailServiceImpl implements ReceivedetailService {
@Resource
ReceiveDetailDao receiveDetailDao;
@Override
public List<PurReceiveDetailEntity> selectByOrderId(String orderId) {
return receiveDetailDao.selectList(new QueryWrapper<PurReceiveDetailEntity>().eq("orderIdFk", orderId));
}
@Override
public List<ReceiveDetailResponse> filterList(FilterReceiveDetailRequest filterReceiveDetailRequest) {
if (null == filterReceiveDetailRequest) {
@ -45,7 +50,7 @@ public class ReceiveDetailServiceImpl implements ReceivedetailService {
@Override
public boolean delDetail(String id) {
receiveDetailDao.deleteById(id);
return true;
return true;
}

15
src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java
Unescape Escape View File

@ -24,6 +24,11 @@ public class ReceiveServiceImpl implements ReceiveService {
@Resource
ReceiveDetailDao receiveDetailDao;
@Override
public PurReceiveEntity selectById(Long id) {
return receiveDao.selectById(id);
}
@Override
public int insertOrder(PurReceiveEntity purReceiveEntity) {
return receiveDao.insert(purReceiveEntity);
@ -47,14 +52,14 @@ public class ReceiveServiceImpl implements ReceiveService {
@Override
public boolean delReceive(String orderIdFk) {
QueryWrapper<PurReceiveEntity> ew=new QueryWrapper<>();
ew.eq("billNo",orderIdFk);
QueryWrapper<PurReceiveEntity> ew = new QueryWrapper<>();
ew.eq("billNo", orderIdFk);
receiveDao.delete(ew);
QueryWrapper<PurReceiveDetailEntity> ew1=new QueryWrapper<>();
ew1.eq("orderIdFk",orderIdFk);
QueryWrapper<PurReceiveDetailEntity> ew1 = new QueryWrapper<>();
ew1.eq("orderIdFk", orderIdFk);
receiveDetailDao.delete(ew1);
return true;
return true;
}

56
src/main/resources/mybatis/mapper/thrsys/ThrBusTypeOriginDao.xml
Unescape Escape View File

@ -3,13 +3,11 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.glxp.api.dao.thrsys.ThrBusTypeOriginDao">
<resultMap id="BaseResultMap" type="com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity">
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
<result column="action" jdbcType="VARCHAR" property="action"/>
<result column="thirdSys" jdbcType="VARCHAR" property="thirdSys"/>
<result column="thirdSysName" jdbcType="VARCHAR" property="thirdSysName"/>
<result column="enable" jdbcType="BOOLEAN" property="enable"/>
<result column="inoutType" jdbcType="INTEGER" property="inoutType"/>
<result column="createTime" jdbcType="TIMESTAMP" property="createTime"/>
@ -20,14 +18,14 @@
</resultMap>
<select id="filterEnableList" resultType="com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity">
select *
<select id="filterEnableList" resultType="com.glxp.api.res.thrsys.ThrBusTypeOriginResponse">
select tbo.*, thr_system.thirdName thirdSysName
from thr_bustype_origin tbo
left join thr_system_detail
on tbo.thirdSys = thr_system_detail.thirdSysFk
left join thr_system on tbo.thirdSys = thr_system.thirdId
left join thr_system_detail on tbo.thirdSys = thr_system_detail.thirdSysFk
<where>
thr_system_detail.`key` = 'busTypeQueryUrl'
and thr_system_detail.enabled = 1
and thr_system_detail.enabled = 1
<if test="name != null and name != ''">
AND tbo.name like concat('%', #{name}, '%')
</if>
@ -36,7 +34,7 @@
</if>
<if test="key != null and key != ''">
AND ((tbo.name LIKE concat('%', #{key}, '%')) or (tbo.action LIKE
concat('%', #{key}, '%')))
concat('%', #{key}, '%')))
</if>
<if test="thirdSys != null and thirdSys != ''">
AND tbo.thirdSys = #{thirdSys}
@ -46,14 +44,14 @@
<select id="filterJoinList" resultType="com.glxp.api.res.thrsys.ThrBusTypeOriginResponse">
select tbo.name,
tbo.action thirdAction,
tbo.name thirdName,
bu.action,
bu.mainAction,
tbo.thirdSys,
bu.corpType
tbo.action thirdAction,
tbo.name thirdName,
bu.action,
bu.mainAction,
tbo.thirdSys,
bu.corpType
from thr_bustype_origin tbo
left join basic_bussiness_type bu on tbo.action = bu.originAction
left join basic_bussiness_type bu on tbo.action = bu.originAction
<where>
<if test="name != null and name != ''">
AND tbo.name like concat('%', #{name}, '%')
@ -76,22 +74,20 @@
<insert id="insertBusOriginType" parameterType="com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity">
replace
into thr_bustype_origin
into thr_bustype_origin
(`name`, `action`, thirdSys, thirdSysName, `enable`, inoutType, updateTime, remark, createUser, updateUser,
createTime)
values (
#{name},
#{action},
#{thirdSys},
#{thirdSysName},
#{enable},
#{inoutType},
#{updateTime},
#{remark},
#{createUser},
#{updateUser},
#{createTime}
)
values (#{name},
#{action},
#{thirdSys},
#{thirdSysName},
#{enable},
#{inoutType},
#{updateTime},
#{remark},
#{createUser},
#{updateUser},
#{createTime})
</insert>
<select id="selectNameByAction" resultType="java.lang.String">
@ -99,4 +95,4 @@
from thr_bustype_origin
where action = #{originAction}
</select>
</mapper>
</mapper>

11
src/main/resources/schemas/schema_v2.1.sql
Unescape Escape View File

@ -1,7 +1,4 @@
-- 删除自助平台表
drop table if exists auth_platform;
-- 删除医院客户和自助平台关联表
drop table if exists io_unit_maintain_platform;
-- 字段新增 （表名，字段名，字段类型，修改方式（1：新增，2：修改，3：删除）
CALL Pro_Temp_ColumnWork('io_order', 'fromReceiveBillNo', 'varchar(255) ', 1);
CALL Pro_Temp_ColumnWork('io_order', 'fromThrBillNo', 'varchar(255) ', 1);
CALL Pro_Temp_ColumnWork('thr_bustype_origin', 'thirdSysName', 'varchar(255) ', 3);

Write Preview
Loading…
Cancel
Save