From d6abb994819ebe4553b1b646d19644119a7fe445 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sat, 25 Feb 2023 22:19:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=EF=BC=8C=E9=A2=86=E7=94=A8=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E5=BE=90=E9=80=89=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoOrderDetailBizController.java | 115 ++++++++++++++++-- .../PurOrderReceiveController.java} | 32 +++-- .../thrsys/ThrBusTypeOriginController.java | 10 +- .../glxp/api/entity/inout/IoOrderEntity.java | 7 ++ .../entity/thrsys/ThrBusTypeOriginEntity.java | 31 +---- .../api/req/inout/AddThrOrderRequest.java | 12 ++ .../glxp/api/res/inout/IoOrderResponse.java | 4 +- .../res/thrsys/ThrBusTypeOriginResponse.java | 63 ++++++++++ .../basic/IBasicBusTypeChangeService.java | 3 + .../impl/BasicBusTypeChangeServiceImpl.java | 5 + .../api/service/inout/ReceiveService.java | 5 +- .../service/inout/ReceivedetailService.java | 3 + .../inout/impl/ReceiveDetailServiceImpl.java | 7 +- .../inout/impl/ReceiveServiceImpl.java | 15 ++- .../mapper/thrsys/ThrBusTypeOriginDao.xml | 56 ++++----- src/main/resources/schemas/schema_v2.1.sql | 11 +- 16 files changed, 274 insertions(+), 105 deletions(-) rename src/main/java/com/glxp/api/controller/{inout/ThrOrderReceiveController.java => purchase/PurOrderReceiveController.java} (92%) create mode 100644 src/main/java/com/glxp/api/req/inout/AddThrOrderRequest.java diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index 1f8064191..deb86645d 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -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 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) { diff --git a/src/main/java/com/glxp/api/controller/inout/ThrOrderReceiveController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java similarity index 92% rename from src/main/java/com/glxp/api/controller/inout/ThrOrderReceiveController.java rename to src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java index ed95e56d3..bc6f349fe 100644 --- a/src/main/java/com/glxp/api/controller/inout/ThrOrderReceiveController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java @@ -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("成功"); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrBusTypeOriginController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrBusTypeOriginController.java index 709cca3eb..815de039c 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrBusTypeOriginController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrBusTypeOriginController.java @@ -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 thrBusTypeOriginEntityEntities = thrBusTypeOriginService.filterEnableList(filterThrBusTypeOriginRequest); PageInfo pageInfo = new PageInfo<>(thrBusTypeOriginEntityEntities); return ResultVOUtils.page(pageInfo); diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java index 1a993442f..c4e742179 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java @@ -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; + } diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrBusTypeOriginEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrBusTypeOriginEntity.java index 652ebeeba..54664fc0b 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrBusTypeOriginEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrBusTypeOriginEntity.java @@ -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"; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/req/inout/AddThrOrderRequest.java b/src/main/java/com/glxp/api/req/inout/AddThrOrderRequest.java new file mode 100644 index 000000000..ea17a85e3 --- /dev/null +++ b/src/main/java/com/glxp/api/req/inout/AddThrOrderRequest.java @@ -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; + +} diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java index a875416fe..ba19b0963 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java @@ -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)) diff --git a/src/main/java/com/glxp/api/res/thrsys/ThrBusTypeOriginResponse.java b/src/main/java/com/glxp/api/res/thrsys/ThrBusTypeOriginResponse.java index 8cc56fc91..e194717be 100644 --- a/src/main/java/com/glxp/api/res/thrsys/ThrBusTypeOriginResponse.java +++ b/src/main/java/com/glxp/api/res/thrsys/ThrBusTypeOriginResponse.java @@ -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; + } diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBusTypeChangeService.java b/src/main/java/com/glxp/api/service/basic/IBasicBusTypeChangeService.java index 2e44a3f3d..f629ab7db 100644 --- a/src/main/java/com/glxp/api/service/basic/IBasicBusTypeChangeService.java +++ b/src/main/java/com/glxp/api/service/basic/IBasicBusTypeChangeService.java @@ -11,6 +11,9 @@ import java.util.List; */ public interface IBasicBusTypeChangeService { + + BasicBusTypeChangeEntity selectByOriginAction(String action); + /** * 查询单据生成设置列表 * diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java index 106c26f0e..80f3f22c9 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java @@ -28,6 +28,11 @@ public class BasicBusTypeChangeServiceImpl implements IBasicBusTypeChangeService @Resource private BasicBusTypeChangeDao basicBusTypeChangeDao; + @Override + public BasicBusTypeChangeEntity selectByOriginAction(String action) { + return basicBusTypeChangeDao.selectOne(new QueryWrapper().eq("originAction", action)); + } + @Override public List filterList(FilterBusTypeChangeRequest filterBusTypeChangeRequest) { if (null == filterBusTypeChangeRequest) { diff --git a/src/main/java/com/glxp/api/service/inout/ReceiveService.java b/src/main/java/com/glxp/api/service/inout/ReceiveService.java index c9dd8efe8..f0592f6d0 100644 --- a/src/main/java/com/glxp/api/service/inout/ReceiveService.java +++ b/src/main/java/com/glxp/api/service/inout/ReceiveService.java @@ -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); diff --git a/src/main/java/com/glxp/api/service/inout/ReceivedetailService.java b/src/main/java/com/glxp/api/service/inout/ReceivedetailService.java index af26d96f0..15e4c8422 100644 --- a/src/main/java/com/glxp/api/service/inout/ReceivedetailService.java +++ b/src/main/java/com/glxp/api/service/inout/ReceivedetailService.java @@ -11,6 +11,9 @@ import java.util.List; public interface ReceivedetailService { + + List selectByOrderId(String orderId); + List filterList(FilterReceiveDetailRequest filterReceiveDetailRequest); int insert(PurReceiveDetailEntity receiveDetailEntity); diff --git a/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java index 71d0e542b..27734edfc 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java @@ -21,6 +21,11 @@ public class ReceiveDetailServiceImpl implements ReceivedetailService { @Resource ReceiveDetailDao receiveDetailDao; + @Override + public List selectByOrderId(String orderId) { + return receiveDetailDao.selectList(new QueryWrapper().eq("orderIdFk", orderId)); + } + @Override public List 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; } diff --git a/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java index c366d4c7a..8bf3bcc2f 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java @@ -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 ew=new QueryWrapper<>(); - ew.eq("billNo",orderIdFk); + QueryWrapper ew = new QueryWrapper<>(); + ew.eq("billNo", orderIdFk); receiveDao.delete(ew); - QueryWrapper ew1=new QueryWrapper<>(); - ew1.eq("orderIdFk",orderIdFk); + QueryWrapper ew1 = new QueryWrapper<>(); + ew1.eq("orderIdFk", orderIdFk); receiveDetailDao.delete(ew1); - return true; + return true; } diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrBusTypeOriginDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrBusTypeOriginDao.xml index 414ef7af9..e052cfd21 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrBusTypeOriginDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrBusTypeOriginDao.xml @@ -3,13 +3,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - @@ -20,14 +18,14 @@ - + 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 thr_system_detail.`key` = 'busTypeQueryUrl' - and thr_system_detail.enabled = 1 + and thr_system_detail.enabled = 1 AND tbo.name like concat('%', #{name}, '%') @@ -36,7 +34,7 @@ AND ((tbo.name LIKE concat('%', #{key}, '%')) or (tbo.action LIKE - concat('%', #{key}, '%'))) + concat('%', #{key}, '%'))) AND tbo.thirdSys = #{thirdSys} @@ -46,14 +44,14 @@ @@ -99,4 +95,4 @@ from thr_bustype_origin where action = #{originAction} - \ No newline at end of file + diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 9989d1159..46ff18635 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -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);