diff --git a/src/main/java/com/glxp/api/constant/ConstantStatus.java b/src/main/java/com/glxp/api/constant/ConstantStatus.java index f6ee07396..73181f089 100644 --- a/src/main/java/com/glxp/api/constant/ConstantStatus.java +++ b/src/main/java/com/glxp/api/constant/ConstantStatus.java @@ -172,6 +172,7 @@ public class ConstantStatus { public static final int FROM_COPY = 10; //单据复制 public static final int FROM_COUNT = 11; //盘点单据转单 public static final int FROM_PLAN = 12; //申购计划转单 + public static final int FROM_RECEIVE = 13; //领用单据转单 //DI类型 diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index a376bf648..f430f9034 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -143,12 +143,9 @@ public class IoOrderController extends BaseController { return ResultVOUtils.error(500, orderDetailBizEntity.getCoName() + "该产品未指定供应商！"); } } + IoOrderEntity orderEntity = orderService.findByBillNo(addOrderRequest.getBillNo()); - orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK); - orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST); - orderEntity.setUpdateTime(new Date()); - orderEntity.setUpdateUser(getUserId() + ""); - orderService.update(orderEntity); + ioAddInoutService.dealBusProcess(orderEntity); return ResultVOUtils.success("提交成功！"); } 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 deb86645d..3a0b3dfa2 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -20,10 +20,8 @@ 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.entity.thrsys.ThrSystemBusApiEntity; +import com.glxp.api.req.inout.*; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.thrsys.FilterThrOrderDetailRequest; import com.glxp.api.res.PageSimpleResponse; @@ -34,7 +32,9 @@ 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.*; +import com.glxp.api.service.thrsys.ThrOrderDetailService; import com.glxp.api.service.thrsys.ThrOrderService; +import com.glxp.api.service.thrsys.ThrSystemBusApiService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import org.springframework.beans.BeanUtils; @@ -72,6 +72,14 @@ public class IoOrderDetailBizController extends BaseController { private IoCheckInoutService ioCheckInoutService; @Resource IoOrderDetailCodeService orderDetailCodeService; + @Resource + ThrOrderService thrOrderService; + @Resource + ReceiveService receiveService; + @Resource + ReceivedetailService receivedetailService; + @Resource + IBasicBusTypeChangeService basicBusTypeChangeService; //获取单据业务详情---临时接口查询 @AuthRuleAnnotation("") @@ -167,44 +175,62 @@ public class IoOrderDetailBizController extends BaseController { @Resource - ThrOrderService thrOrderService; + ThrOrderDetailService thrOrderDetailService; + @Resource + ThrSystemBusApiService thrSystemBusApiService; //选入第三方单据至业务单据 @AuthRuleAnnotation("") @PostMapping("/udiwms/inout/order/addThrOrder") - public BaseResponse addThrOrder(@RequestBody AddThrOrderRequest addThrOrderRequest, + public BaseResponse addThrOrder(@RequestBody ThrOrderEntity thrOrderRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - ThrOrderEntity thrOrderEntity = thrOrderService.findById(addThrOrderRequest.getThrOrderId()); + ThrOrderEntity thrOrderEntity = thrOrderService.findById(thrOrderRequest.getId()); if (thrOrderEntity == null) { return ResultVOUtils.error(ResultEnum.DATA_NOT); } + List thrOrderDetailEntities = thrOrderDetailService.selectByBillNo(thrOrderRequest.getBillNo()); + + //获取单据类型 + ThrSystemBusApiEntity thrSystemBusApiEntity = thrSystemBusApiService.selectByThrBus(thrOrderEntity.getBillType(), thrOrderEntity.getThirdSysFk()); + if (thrSystemBusApiEntity == null && StrUtil.isEmpty(thrSystemBusApiEntity.getCode())) { + return ResultVOUtils.error(500, "单据类型对照有误！"); + } + BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(thrSystemBusApiEntity.getCode()); AuthAdmin authAdmin = getUser(); //创建单据 IoOrderEntity orderEntity = new IoOrderEntity(); -// String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(bussinessTypeEntity.getPrefix()), "yyyyMMdd")); -// orderEntity.setBillNo(orderNo); + 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.setCorpOrderId(thrOrderEntity.getBillNo()); + orderEntity.setAction(bussinessTypeEntity.getAction()); + orderEntity.setMainAction(bussinessTypeEntity.getMainAction()); + orderEntity.setFromThrBillNo(thrOrderEntity.getBillNo()); + + //获取当前部门 + if (StrUtil.isNotEmpty(thrOrderEntity.getInvCode())) { + + } else { + return ResultVOUtils.error(500, "第三方单据所属仓库不能为空！"); + + } + - //todo 单据类型逻辑有误，暂不处理 thrOrderService.updateThrOrder(thrOrderEntity); return ResultVOUtils.success(); } - @Resource - ReceiveService receiveService; - @Resource - ReceivedetailService receivedetailService; - @Resource - IBasicBusTypeChangeService basicBusTypeChangeService; - //选入领用单据至业务单据 @AuthRuleAnnotation("") @PostMapping("/udiwms/inout/order/addReceiveOrder") @@ -229,11 +255,18 @@ public class IoOrderDetailBizController extends BaseController { orderEntity.setUpdateUser(authAdmin.getId() + ""); orderEntity.setUpdateTime(new Date()); orderEntity.setCustomerId(authAdmin.getCustomerId() + ""); + orderEntity.setCorpOrderId(purReceiveEntity.getBillNo()); orderEntity.setAction(bussinessTypeEntity.getAction()); orderEntity.setMainAction(bussinessTypeEntity.getMainAction()); orderEntity.setDeptCode(purReceiveEntity.getTargetDeptCode()); orderEntity.setInvCode(purReceiveEntity.getTargetInvCode()); orderEntity.setFromReceiveBillNo(purReceiveEntity.getBillNo()); + orderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE); + orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_DRAFT); + orderEntity.setFromType(ConstantStatus.FROM_RECEIVE); + orderEntity.setOrderType(ConstantStatus.ORDER_TYPE_BIZ); + orderEntity.setFromDeptCode(purReceiveEntity.getDeptCode()); + orderEntity.setFromInvCode(purReceiveEntity.getInvCode()); orderService.insertOrder(orderEntity); for (PurReceiveDetailEntity purReceiveDetailEntity : purReceiveDetailEntities) { IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); @@ -253,6 +286,7 @@ public class IoOrderDetailBizController extends BaseController { ioOrderDetailBizEntity.setExpireDate(purReceiveDetailEntity.getExpireDate()); ioOrderDetailBizEntity.setBatchNo(purReceiveDetailEntity.getBatchNo()); ioOrderDetailBizEntity.setSupId(purReceiveDetailEntity.getSupId()); + ioOrderDetailBizEntity.setCount(purReceiveDetailEntity.getCount()); orderDetailBizService.insert(ioOrderDetailBizEntity); } return ResultVOUtils.success(); @@ -281,4 +315,23 @@ public class IoOrderDetailBizController extends BaseController { return ResultVOUtils.page(pageInfo); } + + @AuthRuleAnnotation("") + @PostMapping("/udiwms/inout/biz/updateBind") + public BaseResponse updateBindSup(@RequestBody BizBindUpdateRequest bizBindUpdateRequest) { + + + IoOrderDetailBizEntity orderDetailBizEntity = orderDetailBizService.selectById(bizBindUpdateRequest.getId()); + + + if (bizBindUpdateRequest.getBindRlFk() != null) + orderDetailBizEntity.setBindRlFk(bizBindUpdateRequest.getBindRlFk()); + if (StrUtil.isNotEmpty(bizBindUpdateRequest.getSupId())) { + orderDetailBizEntity.setSupId(bizBindUpdateRequest.getSupId()); + } + orderDetailBizService.update(orderDetailBizEntity); + return ResultVOUtils.success("绑定成功"); + } + + } diff --git a/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java b/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java index 50cba0214..6a3de00b4 100644 --- a/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java +++ b/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java @@ -131,16 +131,15 @@ public class SysPdfTemplateController { } @AuthRuleAnnotation("system/pdf/template/delete") - @GetMapping("/system/pdf/template/delete") - public BaseResponse deleteById(@RequestParam("id") Integer id, - @RequestParam("path") String path) { + @PostMapping("/system/pdf/template/delete") + public BaseResponse deleteById(@RequestBody SysPdfTemplateSaveRequest sysPdfTemplateSaveRequest) { - if (StringUtils.isNotBlank(path)) {//删除文件 - File file = new File(path); + if (StringUtils.isNotBlank(sysPdfTemplateSaveRequest.getPath())) {//删除文件 + File file = new File(sysPdfTemplateSaveRequest.getPath()); file.delete(); } - boolean b = systemPDFTemplateService.deleteById(id); + boolean b = systemPDFTemplateService.deleteById(sysPdfTemplateSaveRequest.getId()); if (b) return ResultVOUtils.success("删除成功"); else { diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java index 71d2563b4..82f1bcf3b 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java @@ -201,11 +201,11 @@ public class ThrOrderController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } String id = deleteRequest.getId(); - ThrOrderEntity thrOrderEntity = thrOrderService.findById(id); + ThrOrderEntity thrOrderEntity = thrOrderService.findById(Integer.parseInt(id)); String msg = selectDelect(thrOrderEntity); if (msg == null) { boolean b = thrOrderService.deleteById(id); - thrOrderDetailService.deleteByOrderIdFk(thrOrderEntity.getId() + ""); + thrOrderDetailService.deleteByOrderIdFk(thrOrderEntity.getBillNo() + ""); if (b) return ResultVOUtils.success("删除成功"); else return ResultVOUtils.error(500, "无法删除！"); @@ -325,7 +325,7 @@ public class ThrOrderController { List ids = postSmpOrderRequest.getIds(); for (String id : ids) { - ThrOrderEntity thrOrderEntity = thrOrderService.findById(id); + ThrOrderEntity thrOrderEntity = thrOrderService.findById(Integer.parseInt(id)); UploadSmpRequest uploadSmpRequest = new UploadSmpRequest(); BeanUtils.copyProperties(thrOrderEntity, uploadSmpRequest); uploadSmpRequest.setType(1); diff --git a/src/main/java/com/glxp/api/dao/auth/InvSubWarehouseDao.java b/src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java similarity index 96% rename from src/main/java/com/glxp/api/dao/auth/InvSubWarehouseDao.java rename to src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java index dc9708554..5ae15324d 100644 --- a/src/main/java/com/glxp/api/dao/auth/InvSubWarehouseDao.java +++ b/src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java @@ -12,7 +12,7 @@ import java.util.Date; import java.util.List; @Mapper -public interface InvSubWarehouseDao extends BaseMapperPlus { +public interface InvWarehouseDao extends BaseMapperPlus { List filterInvSubWarehouse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest); diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrOrderDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrOrderDao.java index 405fc0e2b..976a646e1 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrOrderDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrOrderDao.java @@ -1,29 +1,27 @@ package com.glxp.api.dao.thrsys; +import com.glxp.api.dao.BaseMapperPlus; +import com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity; import com.glxp.api.entity.thrsys.ThrOrderEntity; import com.glxp.api.req.thrsys.FilterThrOrderRequest; +import com.glxp.api.res.thrsys.ThrBusTypeOriginResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface ThrOrderDao { +public interface ThrOrderDao extends BaseMapperPlus { List filterThrOrder(FilterThrOrderRequest filterThrOrderRequest); - List filterReceiveOrder(FilterThrOrderRequest filterThrOrderRequest); - - boolean insertThrOrder(ThrOrderEntity thrCorpEntity); boolean importThrOrder(ThrOrderEntity thrCorpEntity); boolean insertThrOrders(@Param("thrOrderEntities") List thrOrderEntities); - boolean updateThrOrder(ThrOrderEntity thrOrderEntity); - boolean deleteById(@Param("id") String id); boolean deleteAll(); diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrOrderDetailDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrOrderDetailDao.java index 1f56b835a..6c22ca3bf 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrOrderDetailDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrOrderDetailDao.java @@ -1,7 +1,9 @@ package com.glxp.api.dao.thrsys; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; +import com.glxp.api.entity.thrsys.ThrOrderEntity; import com.glxp.api.req.thrsys.FilterThrOrderDetailRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -9,7 +11,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface ThrOrderDetailDao { +public interface ThrOrderDetailDao extends BaseMapperPlus { List filterThrOrderDetailDetail(FilterThrOrderDetailRequest filterThrOrderDetailRequest); @@ -19,7 +21,6 @@ public interface ThrOrderDetailDao { boolean insertThrOrderDetails(@Param("thrOrderDetailEntities") List thrOrderDetailEntities); - boolean updateThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity); boolean deleteById(@Param("id") String id); diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrSystemBusApiDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrSystemBusApiDao.java index 1ca20ca40..02cbd0d99 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrSystemBusApiDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrSystemBusApiDao.java @@ -1,5 +1,7 @@ package com.glxp.api.dao.thrsys; +import com.glxp.api.dao.BaseMapperPlus; +import com.glxp.api.entity.thrsys.ThrOrderEntity; import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity; import com.glxp.api.req.thrsys.FilterBasicThirdSysDetailRequest; import org.apache.ibatis.annotations.Mapper; @@ -8,7 +10,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface ThrSystemBusApiDao { +public interface ThrSystemBusApiDao extends BaseMapperPlus { boolean insertSysBusApi(ThrSystemBusApiEntity basicThirdSysEntity); diff --git a/src/main/java/com/glxp/api/entity/system/SystemPDFTemplateEntity.java b/src/main/java/com/glxp/api/entity/system/SystemPDFTemplateEntity.java index 10782dc6b..da7656a26 100644 --- a/src/main/java/com/glxp/api/entity/system/SystemPDFTemplateEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SystemPDFTemplateEntity.java @@ -7,7 +7,7 @@ import java.util.Date; @Data public class SystemPDFTemplateEntity { - private int id; + private Integer id; private String name; private int type; private int module; diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrOrderDetailEntity.java index b57e73699..0217e5c39 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrOrderDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrOrderDetailEntity.java @@ -4,115 +4,196 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; +import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -/** - *

- * - *

- * - * @author 作者 - * @since 2023-01-13 - */ -@Data -@TableName("thr_order_detail") -public class ThrOrderDetailEntity { +import lombok.Data; +@Data +@TableName(value = "thr_order_detail") +public class ThrOrderDetailEntity implements Serializable { @TableId(value = "id", type = IdType.AUTO) private Integer id; - @TableField("productId") + /** + * 产品编码 + */ + @TableField(value = "productId") private String productId; - @TableField("productName") + /** + * 产品名称 + */ + @TableField(value = "productName") private String productName; - @TableField("spec") + /** + * 规格型号 + */ + @TableField(value = "spec") private String spec; - @TableField("batchNo") + /** + * 批次号 + */ + @TableField(value = "batchNo") private String batchNo; - @TableField("expireDate") + /** + * 失效日期 + */ + @TableField(value = "expireDate") private String expireDate; - @TableField("productDate") + /** + * 生产日期 + */ + @TableField(value = "productDate") private String productDate; - @TableField("count") - private int count; + /** + * 数量 + */ + @TableField(value = "`count`") + private Integer count; - @TableField("reCount") - private int reCount; + /** + * 实际数量 + */ + @TableField(value = "reCount") + private Integer reCount; - @TableField("orderIdFk") + /** + * 订单号 + */ + @TableField(value = "orderIdFk") private String orderIdFk; - @TableField("thirdSysFk") + /** + * 第三方系统标识 + */ + @TableField(value = "thirdSysFk") private String thirdSysFk; + /** + * 供应商ID + */ + @TableField(value = "supId") + private String supId; + + /** + * 供应商名称 + */ + @TableField(value = "supName") + private String supName; + /** * 单价 */ - @TableField("price") + @TableField(value = "price") private BigDecimal price; /** * 往来单位 */ - @TableField("corpName") + @TableField(value = "corpName") private String corpName; /** * 医疗器械注册人 */ - @TableField("ylqxzcrbarmc") + @TableField(value = "ylqxzcrbarmc") private String ylqxzcrbarmc; /** * 注册证号 */ - @TableField("zczbhhzbapzbh") + @TableField(value = "zczbhhzbapzbh") private String zczbhhzbapzbh; /** * 生产企业 */ - @TableField("manufactory") + @TableField(value = "manufactory") private String manufactory; /** * 创建人 */ - @TableField("createUser") + @TableField(value = "`createUser`") private String createUser; /** * 创建时间 */ - @TableField("createTime") + @TableField(value = "createTime") private Date createTime; /** * 更新人 */ - @TableField("updateUser") + @TableField(value = "updateUser") private String updateUser; /** * 更新时间 */ - @TableField("updateTime") + @TableField(value = "updateTime") private Date updateTime; /** * 备注 */ - @TableField("remark") + @TableField(value = "remark") private String remark; + private static final long serialVersionUID = 1L; + + public static final String COL_ID = "id"; + + public static final String COL_PRODUCTID = "productId"; + + public static final String COL_PRODUCTNAME = "productName"; + + public static final String COL_SPEC = "spec"; + + public static final String COL_BATCHNO = "batchNo"; + + public static final String COL_EXPIREDATE = "expireDate"; + + public static final String COL_PRODUCTDATE = "productDate"; + + public static final String COL_COUNT = "count"; + + public static final String COL_RECOUNT = "reCount"; + + public static final String COL_ORDERIDFK = "orderIdFk"; + + public static final String COL_THIRDSYSFK = "thirdSysFk"; + + public static final String COL_SUPID = "supId"; + + public static final String COL_SUPNAME = "supName"; + + public static final String COL_PRICE = "price"; + + public static final String COL_CORPNAME = "corpName"; + + public static final String COL_YLQXZCRBARMC = "ylqxzcrbarmc"; + + public static final String COL_ZCZBHHZBAPZBH = "zczbhhzbapzbh"; + + public static final String COL_MANUFACTORY = "manufactory"; + + public static final String COL_CREATEUSER = "createUser"; + + public static final String COL_CREATETIME = "createTime"; + + public static final String COL_UPDATEUSER = "updateUser"; + + public static final String COL_UPDATETIME = "updateTime"; + public static final String COL_REMARK = "remark"; } diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrOrderEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrOrderEntity.java index 1d38a7aaa..31d0a1155 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrOrderEntity.java @@ -10,7 +10,7 @@ import java.util.Date; /** *

- * + * *

* * @author 作者 @@ -18,169 +18,196 @@ import java.util.Date; */ @Data @TableName("thr_order") -public class ThrOrderEntity{ +public class ThrOrderEntity { @TableId(value = "id", type = IdType.AUTO) private Integer id; - @TableField("billNo") - private String billNo; - - @TableField("billdate") - private String billdate; - - @TableField("corpId") - private String corpId; - - @TableField("corpName") - private String corpName; - - @TableField("billType") - private String billType; - - @TableField("billFlag") + /** + * 单据状态 + */ + @TableField(value = "billFlag") private String billFlag; - @TableField("thirdSysFk") - private String thirdSysFk; - /** - * 原始单据类型 + * 单据号 */ - @TableField("originType") - private String originType; + @TableField(value = "billNo") + private String billNo; /** - * 起始日期 + * 单据日期 */ - @TableField("startDate") - private String startDate; + @TableField(value = "billdate") + private String billdate; /** - * 结束日期 + * 单据类型 */ - @TableField("endDate") - private String endDate; + @TableField(value = "billType") + private String billType; /** - * 审核人 + * 单据类型名称 */ - @TableField("reviewUser") - private String reviewUser; + @TableField(value = "billTypeName") + private String billTypeName; /** - * 地址 + * 往来单位编码 */ - @TableField("address") - private String address; + @TableField(value = "corpId") + private String corpId; /** - * 联系人 + * 往来单位名称 */ - @TableField("linkMan") - private String linkMan; + @TableField(value = "corpName") + private String corpName; /** - * 联系电话 + * 出入库类型1:入库，2:出库 */ - @TableField("linkTel") - private String linkTel; + @TableField(value = "inoutType") + private Byte inoutType; /** - * 备注 + * 当前部门编码 */ - @TableField("remark") - private String remark; + @TableField(value = "deptCode") + private String deptCode; /** - * 备注1 + * 当前部门名称 */ - @TableField("remark1") - private String remark1; + @TableField(value = "deptName") + private String deptName; /** - * 备注2 + * 当前仓库编码 */ - @TableField("remark2") - private String remark2; + @TableField(value = "invCode") + private String invCode; /** - * 备注3 + * 当前仓库名称 */ - @TableField("remark3") - private String remark3; - - @TableField("type") - private Integer type; - - @TableField("locStorageCode") - private String locStorageCode; - - @TableField("editStatus") - private Integer editStatus; + @TableField(value = "invName") + private String invName; /** - * 分库 + * 第三方系统标识 */ - @TableField("invWarehouseCode") - private String invWarehouseCode; + @TableField(value = "thirdSysFk") + private String thirdSysFk; /** - * 医疗器械注册人 + * 创建人 */ - @TableField("ylqxzcrbarmc") - private String ylqxzcrbarmc; + @TableField(value = "`createUser`") + private String createUser; /** - * 注册证号 + * 创建时间 */ - @TableField("zczbhhzbapzbh") - private String zczbhhzbapzbh; + @TableField(value = "createTime") + private Date createTime; /** - * 生产企业 + * 更新人 */ - @TableField("manufactory") - private String manufactory; + @TableField(value = "updateUser") + private String updateUser; /** - * 判断来源至哪里1：第三方 2：自己创建 + * 更新时间 */ - @TableField("thirdPartyDate") - private Integer thirdPartyDate; + @TableField(value = "updateTime") + private Date updateTime; - @TableField("unitIdFk") - private String unitIdFk; + /** + * 审核人 + */ + @TableField(value = "reviewUser") + private String reviewUser; /** - * 往来分库 + * 审核时间 */ - @TableField("fromSubInvCode") - private String fromSubInvCode; + @TableField(value = "reviewTime") + private Date reviewTime; /** - * 创建人 + * 地址 */ - @TableField("createUser") - private String createUser; + @TableField(value = "address") + private String address; /** - * 创建时间 + * 联系人 */ - @TableField("createTime") - private Date createTime; + @TableField(value = "linkMan") + private String linkMan; /** - * 更新人 + * 联系电话 */ - @TableField("updateUser") - private String updateUser; + @TableField(value = "linkTel") + private String linkTel; /** - * 更新时间 + * 备注 */ - @TableField("updateTime") - private Date updateTime; + @TableField(value = "remark") + private String remark; + + private static final long serialVersionUID = 1L; + + public static final String COL_ID = "id"; + + public static final String COL_BILLFLAG = "billFlag"; + + public static final String COL_BILLNO = "billNo"; + + public static final String COL_BILLDATE = "billdate"; + + public static final String COL_BILLTYPE = "billType"; + + public static final String COL_BILLTYPENAME = "billTypeName"; + + public static final String COL_CORPID = "corpId"; + + public static final String COL_CORPNAME = "corpName"; + + public static final String COL_INOUTTYPE = "inoutType"; + + public static final String COL_DEPTCODE = "deptCode"; + + public static final String COL_DEPTNAME = "deptName"; + + public static final String COL_INVCODE = "invCode"; + + public static final String COL_INVNAME = "invName"; + + public static final String COL_THIRDSYSFK = "thirdSysFk"; + + public static final String COL_CREATEUSER = "createUser"; + + public static final String COL_CREATETIME = "createTime"; + + public static final String COL_UPDATEUSER = "updateUser"; + + public static final String COL_UPDATETIME = "updateTime"; + + public static final String COL_REVIEWUSER = "reviewUser"; + + public static final String COL_REVIEWTIME = "reviewTime"; + + public static final String COL_ADDRESS = "address"; + + public static final String COL_LINKMAN = "linkMan"; + public static final String COL_LINKTEL = "linkTel"; + public static final String COL_REMARK = "remark"; } diff --git a/src/main/java/com/glxp/api/req/inout/BizBindUpdateRequest.java b/src/main/java/com/glxp/api/req/inout/BizBindUpdateRequest.java new file mode 100644 index 000000000..43710c4b9 --- /dev/null +++ b/src/main/java/com/glxp/api/req/inout/BizBindUpdateRequest.java @@ -0,0 +1,12 @@ +package com.glxp.api.req.inout; + +import lombok.Data; + +@Data +public class BizBindUpdateRequest { + + private Integer id; + private Long bindRlFk; + private String supId; + +} diff --git a/src/main/java/com/glxp/api/req/system/SysPdfTemplateSaveRequest.java b/src/main/java/com/glxp/api/req/system/SysPdfTemplateSaveRequest.java index 797a8aa4b..b59edb365 100644 --- a/src/main/java/com/glxp/api/req/system/SysPdfTemplateSaveRequest.java +++ b/src/main/java/com/glxp/api/req/system/SysPdfTemplateSaveRequest.java @@ -7,7 +7,7 @@ import java.util.Date; @Data public class SysPdfTemplateSaveRequest { - private int id; + private Integer id; private String name; private int type; private int module; @@ -19,4 +19,4 @@ public class SysPdfTemplateSaveRequest { private Date create_time; private Date update_time; private String jrxmlPath; -} \ No newline at end of file +} 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 ba19b0963..50c45bb27 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java @@ -204,8 +204,8 @@ public class IoOrderResponse { * 单据类型：1.业务单据，2:扫码单据,3.正常处理单据 只有草稿，异常，待处理 */ private Integer orderType; - private Integer fromReceiveBillNo; - private Integer fromThrBillNo; + private String fromReceiveBillNo; + private String fromThrBillNo; //是否可以补单 private boolean enableSupplementOrder; diff --git a/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java index 875458cdb..6cc18054e 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java @@ -3,7 +3,7 @@ package com.glxp.api.service.auth.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.dao.auth.InvSubWarehouseDao; +import com.glxp.api.dao.auth.InvWarehouseDao; import com.glxp.api.dao.thrsys.ThrSystemDao; import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity; @@ -25,7 +25,7 @@ public class InvWarehouseServiceImpl implements InvWarehouseService { @Resource - InvSubWarehouseDao invSubWarehouseDao; + InvWarehouseDao invWarehouseDao; @Resource private ThrSystemDao thrSystemDao; @@ -33,7 +33,7 @@ public class InvWarehouseServiceImpl implements InvWarehouseService { public InvWarehouseEntity findById(String id) { FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest(); filterInvSubWarehouseRequest.setId(id); - List data = invSubWarehouseDao.filterInvSubWarehouse(filterInvSubWarehouseRequest); + List data = invWarehouseDao.filterInvSubWarehouse(filterInvSubWarehouseRequest); if (CollUtil.isNotEmpty(data)) { return data.get(0); } @@ -49,7 +49,7 @@ public class InvWarehouseServiceImpl implements InvWarehouseService { int offset = (filterInvSubWarehouseRequest.getPage() - 1) * filterInvSubWarehouseRequest.getLimit(); PageHelper.offsetPage(offset, filterInvSubWarehouseRequest.getLimit()); } - List data = invSubWarehouseDao.filterInvSubWarehouse(filterInvSubWarehouseRequest); + List data = invWarehouseDao.filterInvSubWarehouse(filterInvSubWarehouseRequest); return data; } @@ -62,20 +62,20 @@ public class InvWarehouseServiceImpl implements InvWarehouseService { int offset = (filterInvWarehouseRequest.getPage() - 1) * filterInvWarehouseRequest.getLimit(); PageHelper.offsetPage(offset, filterInvWarehouseRequest.getLimit()); } - List data = invSubWarehouseDao.filterGroupInvSub(filterInvWarehouseRequest); + List data = invWarehouseDao.filterGroupInvSub(filterInvWarehouseRequest); return data; } @Override public InvWarehouseEntity selectMaxCode(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest) { - return invSubWarehouseDao.selectMaxCode(filterInvSubWarehouseRequest); + return invWarehouseDao.selectMaxCode(filterInvSubWarehouseRequest); } @Override public List findByParentId(String code) { FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest(); filterInvSubWarehouseRequest.setParentId(code); - List invSubWarehouseEntities = invSubWarehouseDao.filterInvSubWarehouse(filterInvSubWarehouseRequest); + List invSubWarehouseEntities = invWarehouseDao.filterInvSubWarehouse(filterInvSubWarehouseRequest); return invSubWarehouseEntities; } @@ -85,7 +85,7 @@ public class InvWarehouseServiceImpl implements InvWarehouseService { return null; FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest(); filterInvSubWarehouseRequest.setCode(code); - List invSubWarehouseEntities = invSubWarehouseDao.filterInvSubWarehouse(filterInvSubWarehouseRequest); + List invSubWarehouseEntities = invWarehouseDao.filterInvSubWarehouse(filterInvSubWarehouseRequest); if (CollUtil.isNotEmpty(invSubWarehouseEntities)) { return invSubWarehouseEntities.get(0); } @@ -94,27 +94,27 @@ public class InvWarehouseServiceImpl implements InvWarehouseService { @Override public boolean insertInvSubWarehouse(InvWarehouseEntity invWarehouseEntity) { - return invSubWarehouseDao.insertInvSubWarehouse(invWarehouseEntity); + return invWarehouseDao.insertInvSubWarehouse(invWarehouseEntity); } @Override public boolean updateInvSubWarehouse(InvWarehouseEntity invWarehouseEntity) { - return invSubWarehouseDao.updateInvSubWarehouse(invWarehouseEntity); + return invWarehouseDao.updateInvSubWarehouse(invWarehouseEntity); } @Override public boolean deleteById(String id) { - return invSubWarehouseDao.deleteById(id); + return invWarehouseDao.deleteById(id); } @Override public boolean deleteByParentCode(String code) { - return invSubWarehouseDao.deleteByParentCode(code); + return invWarehouseDao.deleteByParentCode(code); } @Override public boolean checkDuplicateName(String parentId, String name) { - int count = invSubWarehouseDao.countByParentIdAndName(parentId, name); + int count = invWarehouseDao.countByParentIdAndName(parentId, name); if (count > 0) { return true; } @@ -126,7 +126,7 @@ public class InvWarehouseServiceImpl implements InvWarehouseService { if (StrUtil.isBlank(subInvCode)) { return ""; } - return invSubWarehouseDao.selectNameByCode(subInvCode); + return invWarehouseDao.selectNameByCode(subInvCode); } @Override @@ -138,7 +138,7 @@ public class InvWarehouseServiceImpl implements InvWarehouseService { return null; FilterInvSubWarehouseRequest tempReqeust = new FilterInvSubWarehouseRequest(); tempReqeust.setCode(id); - InvWarehouseEntity invWarehouseEntity = invSubWarehouseDao.selectJoinThirdSys(tempReqeust); + InvWarehouseEntity invWarehouseEntity = invWarehouseDao.selectJoinThirdSys(tempReqeust); List invWarehouseThirdSysResponses = new ArrayList<>(); for (ThrSystemEntity sys : data) { InvWarehouseThirdSysResponse invWarehouseThirdSysResponse = new InvWarehouseThirdSysResponse(); @@ -170,13 +170,13 @@ public class InvWarehouseServiceImpl implements InvWarehouseService { @Override public boolean bindThrWarehouse(String id, String thridWarehouseId, String sysId) { - return invSubWarehouseDao.updateThridId(id, thridWarehouseId, sysId); + return invWarehouseDao.updateThridId(id, thridWarehouseId, sysId); } @Override public boolean unbindThrWarehouse(String id, String sysId) { - return invSubWarehouseDao.updateThridId(id, null, sysId); + return invWarehouseDao.updateThridId(id, null, sysId); } @@ -189,27 +189,27 @@ public class InvWarehouseServiceImpl implements InvWarehouseService { int offset = (filterInvSubWarehouseRequest.getPage() - 1) * filterInvSubWarehouseRequest.getLimit(); PageHelper.offsetPage(offset, filterInvSubWarehouseRequest.getLimit()); } - List data = invSubWarehouseDao.filterInvSubWarehouseResponse(filterInvSubWarehouseRequest); + List data = invWarehouseDao.filterInvSubWarehouseResponse(filterInvSubWarehouseRequest); return data; } @Override public InvWarehouseEntity filterGroupInvSubAndcode(String code) { - return invSubWarehouseDao.filterGroupInvSubAndcode(code); + return invWarehouseDao.filterGroupInvSubAndcode(code); } @Override public List filterGroupInvSubDown(FilterInvWarehouseRequest filterInvSubWarehouseRequest) { - return invSubWarehouseDao.filterGroupInvSubDown(filterInvSubWarehouseRequest); + return invWarehouseDao.filterGroupInvSubDown(filterInvSubWarehouseRequest); } @Override public List filterSubInvList(FilterInvWarehouseRequest filterInvWarehouseRequest) { - return invSubWarehouseDao.filterSubInvList(filterInvWarehouseRequest); + return invWarehouseDao.filterSubInvList(filterInvWarehouseRequest); } @Override public List findInvListByUser(Long userId) { - return invSubWarehouseDao.selectInvListByUser(userId); + return invWarehouseDao.selectInvListByUser(userId); } } diff --git a/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java index cd0ea3278..ca84ddc17 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java @@ -2,7 +2,7 @@ package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageHelper; -import com.glxp.api.dao.auth.InvSubWarehouseDao; +import com.glxp.api.dao.auth.InvWarehouseDao; import com.glxp.api.dao.basic.EntrustReceDao; import com.glxp.api.entity.basic.DlEntrustReceEntity; import com.glxp.api.entity.basic.EntrustReceEntity; @@ -21,7 +21,7 @@ public class EntrustReceServiceImpl implements EntrustReceService { @Resource EntrustReceDao entrustReceDao; @Resource - private InvSubWarehouseDao invSubWarehouseDao; + private InvWarehouseDao invWarehouseDao; @Override public EntrustReceEntity findById(Integer id) { @@ -78,10 +78,10 @@ public class EntrustReceServiceImpl implements EntrustReceService { if (CollUtil.isNotEmpty(entrustReceResponses)) { //查询当前分库名称和委托验收分库名称 entrustReceResponses.forEach(entrustReceResponse -> { - String invWarehouseName = invSubWarehouseDao.selectNameByCode(entrustReceResponse.getInvWarehouseCode());//查询当前分库名称 + String invWarehouseName = invWarehouseDao.selectNameByCode(entrustReceResponse.getInvWarehouseCode());//查询当前分库名称 entrustReceResponse.setInvWarehouseName(invWarehouseName); - String entrustSubInvName = invSubWarehouseDao.selectNameByCode(entrustReceResponse.getEntrustSubInv()); + String entrustSubInvName = invWarehouseDao.selectNameByCode(entrustReceResponse.getEntrustSubInv()); entrustReceResponse.setEntrustSubInvName(entrustSubInvName); }); } diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java index 3f16d6576..455361927 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -67,7 +67,7 @@ public class IoAddInoutService { @Resource SystemParamConfigService systemParamConfigService; - //新增单据处理 + //新增扫码单据处理 public void dealProcess(IoOrderEntity orderEntity) { orderEntity.setRemark("正在处理！"); @@ -224,6 +224,76 @@ public class IoAddInoutService { } + + //新增业务单据处理 + public void dealBusProcess(IoOrderEntity orderEntity) { + orderEntity.setRemark("正在处理！"); + orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESSING); + orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST); + orderEntity.setUpdateTime(new Date()); + orderService.update(orderEntity); + + + List orderEntities = orderService.isExitRepeat(orderEntity.getCorpOrderId(), orderEntity.getBillNo()); + if (CollUtil.isNotEmpty(orderEntities)) { + orderEntity.setRemark("单据重复上传"); + orderEntity.setStatus(ConstantStatus.ORDER_STATS_ERROR); + orderEntity.setUpdateTime(new Date()); + orderService.update(orderEntity); + return; + } + + + if (StrUtil.isEmpty(orderEntity.getFromCorp()) && StrUtil.isEmpty(orderEntity.getFromInvCode())) { + orderEntity.setRemark("未选择往来单位"); + orderEntity.setStatus(ConstantStatus.ORDER_STATS_ERROR); + orderEntity.setUpdateTime(new Date()); + orderService.update(orderEntity); + return; + } + + if (StrUtil.isEmpty(orderEntity.getInvCode())) { + orderEntity.setRemark("未选择当前仓库信息"); + orderEntity.setStatus(ConstantStatus.ORDER_STATS_ERROR); + orderEntity.setUpdateTime(new Date()); + orderService.update(orderEntity); + return; + } + + + String errMsg = ""; + List orderDetailBizEntities = orderDetailBizService.findByOrderId(orderEntity.getBillNo()); + if (CollUtil.isNotEmpty(orderDetailBizEntities)) { + for (IoOrderDetailBizEntity orderDetailBizEntity : orderDetailBizEntities) { + if (StrUtil.isEmpty(orderDetailBizEntity.getSupId())) { + errMsg = errMsg + orderDetailBizEntity.getCoName() + "未绑定供应商;"; + } + + if (orderDetailBizEntity.getBindRlFk() == null) { + errMsg = errMsg + orderDetailBizEntity.getCoName() + "未绑定耗材字典编码;"; + } + } + } + + if (StrUtil.isNotEmpty(errMsg)) { + orderEntity.setRemark(errMsg); + orderEntity.setStatus(ConstantStatus.ORDER_STATS_ERROR); + orderEntity.setUpdateTime(new Date()); + orderService.update(orderEntity); + return; + } + + orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK); + orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST); + orderEntity.setUpdateTime(new Date()); + orderService.update(orderEntity); + return; + + } + + @Resource + IoOrderDetailBizService orderDetailBizService; + //生成扫码单据详情 public void genOrderDetailCode(IoOrderEntity orderEntity, IoCodeTempEntity codeTempEntity) { diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java index e2e7506b4..2efa89797 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java @@ -8,6 +8,9 @@ import java.util.List; public interface IoOrderDetailBizService { + + IoOrderDetailBizEntity selectById(Integer id); + List findByOrderId(String orderId); int insert(IoOrderDetailBizEntity orderDetailBizEntity); @@ -20,7 +23,7 @@ public interface IoOrderDetailBizService { boolean isExit(String billNo); - boolean isExit(Long relId, String bacthNo, Integer ignoreId,String orderId); + boolean isExit(Long relId, String bacthNo, Integer ignoreId, String orderId); IoOrderDetailBizEntity findByUnique(String orderId, Long relId, String bacthNo); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java index d05815fae..378b5d416 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java @@ -23,6 +23,11 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { @Resource IoOrderDetailBizDao ioOrderDetailBizDao; + @Override + public IoOrderDetailBizEntity selectById(Integer id) { + return ioOrderDetailBizDao.selectById(id); + } + @Override public List findByOrderId(String orderId) { return ioOrderDetailBizDao.selectList(new QueryWrapper().eq("orderIdFk", orderId)); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index 84b8cbb04..42aa49f3c 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -11,18 +11,15 @@ import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.auth.DeptDao; -import com.glxp.api.dao.auth.InvSubWarehouseDao; +import com.glxp.api.dao.auth.InvWarehouseDao; import com.glxp.api.dao.basic.BasicBussinessTypeDao; import com.glxp.api.dao.basic.BasicCorpDao; import com.glxp.api.dao.inout.IoOrderDao; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; -import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.inout.*; import com.glxp.api.entity.inv.*; import com.glxp.api.req.inout.FilterOrderRequest; import com.glxp.api.req.inout.OrderEditRequest; -import com.glxp.api.req.inv.FilterInvProductDetailRequest; -import com.glxp.api.req.inv.FilterInvProductRequest; import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.res.inout.OrderNoResult; import com.glxp.api.service.basic.IBasicBussinessTypeService; @@ -33,12 +30,10 @@ import com.glxp.api.util.udi.UdiCalCountUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.lang.reflect.Field; import java.util.*; -import java.util.stream.Collectors; @Slf4j @Service @@ -53,7 +48,7 @@ public class IoOrderServiceImpl implements IoOrderService { @Resource private DeptDao deptDao; @Resource - private InvSubWarehouseDao invSubWarehouseDao; + private InvWarehouseDao invWarehouseDao; @Resource IBasicBussinessTypeService basicBussinessTypeService; @Resource @@ -525,7 +520,7 @@ public class IoOrderServiceImpl implements IoOrderService { String deptName = deptDao.selectNameByCode(order.getDeptCode()); response.setDeptName(deptName); //查询仓库名称 - String invName = invSubWarehouseDao.selectNameByCode(order.getInvCode()); + String invName = invWarehouseDao.selectNameByCode(order.getInvCode()); response.setInvName(invName); responseList.add(response); } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java index 377158750..5c39687cf 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java @@ -8,7 +8,7 @@ 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.dao.auth.InvSpaceDao; -import com.glxp.api.dao.auth.InvSubWarehouseDao; +import com.glxp.api.dao.auth.InvWarehouseDao; import com.glxp.api.dao.inv.InvProductDetailDao; import com.glxp.api.entity.inv.InvProductDetailEntity; import com.glxp.api.req.inv.FilterInvPlaceRequest; @@ -32,7 +32,7 @@ public class InvPlaceServiceImpl implements InvPlaceService { @Resource private InvProductDetailDao invProductDetailDao; @Resource - private InvSubWarehouseDao invSubWarehouseDao; + private InvWarehouseDao invWarehouseDao; @Resource private InvSpaceDao invSpaceDao; @@ -50,7 +50,7 @@ public class InvPlaceServiceImpl implements InvPlaceService { @Override public void bindInvSpace(BindInvSpaceRequest bindInvSpaceRequest) { //查询仓库的部门ID - String deptCode = invSubWarehouseDao.selectParentIdByCode(bindInvSpaceRequest.getInvCode()); + String deptCode = invWarehouseDao.selectParentIdByCode(bindInvSpaceRequest.getInvCode()); List list = invProductDetailDao.selectList(new QueryWrapper() .select("id") .eq("deptCode", deptCode) @@ -69,7 +69,7 @@ public class InvPlaceServiceImpl implements InvPlaceService { @Override public BaseResponse checkCodeSpace(BindInvSpaceRequest bindInvSpaceRequest) { //查询仓库的部门ID - String deptCode = invSubWarehouseDao.selectParentIdByCode(bindInvSpaceRequest.getInvCode()); + String deptCode = invWarehouseDao.selectParentIdByCode(bindInvSpaceRequest.getInvCode()); bindInvSpaceRequest.setDeptCode(deptCode); //查询此库存详情的信息 InvProductDetailEntity invProductDetailEntity = invProductDetailDao.selectByInvAndCode(bindInvSpaceRequest); diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrOrderDetailService.java b/src/main/java/com/glxp/api/service/thrsys/ThrOrderDetailService.java index 49f6a4d2f..fe7f6b223 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrOrderDetailService.java @@ -1,7 +1,6 @@ package com.glxp.api.service.thrsys; - import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; import com.glxp.api.req.thrsys.FilterThrOrderDetailRequest; @@ -10,13 +9,15 @@ import java.util.List; public interface ThrOrderDetailService { + List selectByBillNo(String billNo); + List filterThrOrderDetailDetail(FilterThrOrderDetailRequest filterThrOrderDetailRequest); boolean insertThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity); boolean insertThrOrderDetails(List thrOrderDetailEntities); - boolean updateThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity); + int updateThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity); boolean deleteById(String id); diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrOrderService.java b/src/main/java/com/glxp/api/service/thrsys/ThrOrderService.java index 054603c08..e19fdb28c 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrOrderService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrOrderService.java @@ -1,7 +1,6 @@ package com.glxp.api.service.thrsys; - import com.glxp.api.entity.thrsys.ThrOrderEntity; import com.glxp.api.req.thrsys.FilterThrOrderRequest; import com.glxp.api.res.thrsys.ThrErpOrderResponse; @@ -13,8 +12,6 @@ public interface ThrOrderService { List filterThrOrder(FilterThrOrderRequest filterThrOrderRequest); - List filterReceiveOrder(FilterThrOrderRequest filterThrOrderRequest); - List filterAllOrders(List billNos, String action); @@ -24,13 +21,13 @@ public interface ThrOrderService { ThrOrderEntity findReceiveOrder(String billNo); - ThrOrderEntity findById(String id); + ThrOrderEntity findById(Integer id); boolean insertThrOrder(ThrOrderEntity thrCorpEntity); boolean insertThrOrders(List thrOrderEntities); - boolean updateThrOrder(ThrOrderEntity thrOrderEntity); + int updateThrOrder(ThrOrderEntity thrOrderEntity); boolean deleteById(String id); diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrSystemBusApiService.java b/src/main/java/com/glxp/api/service/thrsys/ThrSystemBusApiService.java index 34ac2de2e..a6117b5c2 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrSystemBusApiService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrSystemBusApiService.java @@ -14,6 +14,9 @@ public interface ThrSystemBusApiService { ThrSystemBusApiEntity selectByKey(String key, String thirdSys); + + ThrSystemBusApiEntity selectByThrBus(String action, String thirdSys); + List filterSysBusApi(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest); diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderDetailServiceImpl.java index 9aa3dd5a4..125774934 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.thrsys.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.ThrOrderDetailDao; import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; @@ -17,6 +18,11 @@ public class ThrOrderDetailServiceImpl implements ThrOrderDetailService { @Resource ThrOrderDetailDao thrOrderDetailDao; + @Override + public List selectByBillNo(String billNo) { + return thrOrderDetailDao.selectList(new QueryWrapper().eq("orderIdFk", billNo)); + } + @Override public List filterThrOrderDetailDetail(FilterThrOrderDetailRequest filterThrOrderDetailRequest) { if (filterThrOrderDetailRequest == null) { @@ -41,8 +47,8 @@ public class ThrOrderDetailServiceImpl implements ThrOrderDetailService { } @Override - public boolean updateThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity) { - return thrOrderDetailDao.updateThrOrderDetail(thrOrderDetailEntity); + public int updateThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity) { + return thrOrderDetailDao.updateById(thrOrderDetailEntity); } @Override diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java index a12a43b81..b6813e254 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java @@ -40,19 +40,6 @@ public class ThrOrderServiceImpl implements ThrOrderService { return data; } - @Override - public List filterReceiveOrder(FilterThrOrderRequest filterThrOrderRequest) { - if (filterThrOrderRequest == null) { - return Collections.emptyList(); - } - if (filterThrOrderRequest.getPage() != null) { - int offset = (filterThrOrderRequest.getPage() - 1) * filterThrOrderRequest.getLimit(); - PageHelper.offsetPage(offset, filterThrOrderRequest.getLimit()); - } - List data = thrOrderDao.filterReceiveOrder(filterThrOrderRequest); - return data; - } - @Override public List filterAllOrders(List billNos, String thirdSys) { @@ -154,14 +141,8 @@ public class ThrOrderServiceImpl implements ThrOrderService { } @Override - public ThrOrderEntity findById(String id) { - FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); - filterThrOrderRequest.setId(id); - List thrOrderEntities = filterThrOrder(filterThrOrderRequest); - if (thrOrderEntities != null && thrOrderEntities.size() > 0) { - return thrOrderEntities.get(0); - } - return null; + public ThrOrderEntity findById(Integer id) { + return thrOrderDao.selectById(id); } @Override @@ -175,8 +156,8 @@ public class ThrOrderServiceImpl implements ThrOrderService { } @Override - public boolean updateThrOrder(ThrOrderEntity thrOrderEntity) { - return thrOrderDao.updateThrOrder(thrOrderEntity); + public int updateThrOrder(ThrOrderEntity thrOrderEntity) { + return thrOrderDao.updateById(thrOrderEntity); } @Override diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemBusApiServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemBusApiServiceImpl.java index 318ee12b6..78d669071 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemBusApiServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemBusApiServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.thrsys.impl; import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.glxp.api.dao.thrsys.ThrSystemBusApiDao; import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity; import com.glxp.api.req.thrsys.FilterBasicThirdSysDetailRequest; @@ -39,6 +40,11 @@ public class ThrSystemBusApiServiceImpl implements ThrSystemBusApiService { return null; } + @Override + public ThrSystemBusApiEntity selectByThrBus(String action, String thirdSys) { + return thrSystemBusApiDao.selectOne(new QueryWrapper().eq("thirdBuyCode", action).eq("thirdSys", thirdSys)); + } + @Override public List filterSysBusApi(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest) { return thrSystemBusApiDao.filterSysBusApi(filterBasicThirdSysDetailRequest); diff --git a/src/main/java/com/glxp/api/task/TaskExecutorConfig.java b/src/main/java/com/glxp/api/task/TaskExecutorConfig.java new file mode 100644 index 000000000..22ce458a9 --- /dev/null +++ b/src/main/java/com/glxp/api/task/TaskExecutorConfig.java @@ -0,0 +1,34 @@ +package com.glxp.api.task; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.annotation.AsyncConfigurer; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; + +import java.lang.reflect.Method; +import java.util.concurrent.Executor; + +@EnableAsync +@Configuration +public class TaskExecutorConfig implements AsyncConfigurer { + + private static final Logger log = LoggerFactory.getLogger(TaskExecutorConfig.class); + + + @Override + public Executor getAsyncExecutor() { + ThreadPoolTaskExecutor threadPool = new ThreadPoolTaskExecutor(); + threadPool.setCorePoolSize(10);//当前线程数 + threadPool.setMaxPoolSize(20);// 最大线程数 + threadPool.setQueueCapacity(5);//线程池所使用的缓冲队列 + threadPool.setWaitForTasksToCompleteOnShutdown(true);//等待任务在关机时完成--表明等待所有线程执行完 + threadPool.setAwaitTerminationSeconds(60 * 15);// 等待时间 （默认为0，此时立即停止），并没等待xx秒后强制停止 + threadPool.setThreadNamePrefix("MyAsync-");// 线程名称前缀 + threadPool.initialize(); // 初始化 + return threadPool; + } + +} diff --git a/src/main/resources/mybatis/mapper/auth/PurPlanService.xml b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml similarity index 99% rename from src/main/resources/mybatis/mapper/auth/PurPlanService.xml rename to src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml index a1df15fee..02e6ff26c 100644 --- a/src/main/resources/mybatis/mapper/auth/PurPlanService.xml +++ b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml @@ -1,7 +1,7 @@ - + select parentId from auth_warehouse where code = #{invCode} - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index e926fee3c..e06c6e01b 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -305,13 +305,16 @@ AND supName LIKE concat('%', #{supName}, '%') + + AND nameCode LIKE concat(#{nameCode}, '%') + AND cpmctymc LIKE concat('%', #{cpmctymc}, '%') AND ggxh LIKE concat('%', #{ggxh}, '%') - + and ( nameCode LIKE concat('%', #{nameCode}, '%') or ybbm LIKE concat('%', #{nameCode}, '%') diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml index 4bbe74e69..6ddd2a8b8 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml @@ -2,206 +2,145 @@ - - - - replace - INTO thr_order - (id,billNo, billdate, corpId, corpName, billType, billFlag, thirdSysFk, updateTime, originType, unitIdFk, - startDate, endDate, createUser, reviewUser, address, linkMan, linkTel, remark, remark1, remark2, - remark3, locStorageCode,editStatus,invWarehouseCode,thirdPartyDate,fromSubInvCode,`type`,allocateStatus) - values ( - #{id}, - #{billNo}, - #{billdate}, - #{corpId}, - #{corpName}, - #{billType}, - #{billFlag}, - #{thirdSysFk}, - #{updateTime}, - #{originType}, - #{unitIdFk}, - #{startDate}, - #{endDate}, - #{createUser}, - #{reviewUser}, - #{address}, - #{linkMan}, - #{linkTel}, - #{remark}, - #{remark1}, - #{remark2}, - #{remark3}, - #{locStorageCode}, - #{editStatus}, - #{invWarehouseCode}, - #{thirdPartyDate}, - #{fromSubInvCode}, - #{type}, - #{allocateStatus} - ) + INTO thr_order + (id, billFlag, billNo, billdate, billType, billTypeName, corpId, corpName, inoutType, deptCode, deptName, + invCode, invName, thirdSysFk, createUser, createTime, updateUser, updateTime, reviewUser, reviewTime, address, + linkMan, linkTel, remark) + values (#{id}, + #{billFlag}, + #{billNo}, + #{billdate}, + #{billType}, + #{billTypeName}, + #{corpId}, + #{corpName}, + #{inoutType}, + #{deptCode}, + #{deptName}, + #{invCode}, + #{invName}, + #{thirdSysFk}, + #{createUser}, + #{createTime}, + #{updateUser}, + #{updateTime}, + #{reviewUser}, + #{reviewTime}, + #{address}, + #{linkMan}, + #{linkTel}, + #{remark}) replace - INTO thr_order - (id,billNo, billdate, corpId, corpName, billType, billFlag, thirdSysFk, updateTime, originType, - startDate, endDate, createUser, reviewUser, address, linkMan, linkTel, remark, remark1, remark2, - remark3,invWarehouseCode,fromSubInvCode,`type`,allocateStatus) - values ( - #{id}, - #{billNo}, - #{billdate}, - #{corpId}, - #{corpName}, - #{billType}, - #{billFlag}, - #{thirdSysFk}, - #{updateTime}, - #{originType}, - #{startDate}, - #{endDate}, - #{createUser}, - #{reviewUser}, - #{address}, - #{linkMan}, - #{linkTel}, - #{remark}, - #{remark1}, - #{remark2}, - #{remark3}, - #{invWarehouseCode}, - #{fromSubInvCode}, - #{type}, - #{allocateStatus} - ) + INTO thr_order + (id, billFlag, billNo, billdate, billType, billTypeName, corpId, corpName, inoutType, deptCode, deptName, + invCode, invName, thirdSysFk, createUser, createTime, updateUser, updateTime, reviewUser, reviewTime, address, + linkMan, linkTel, remark) + values (#{id}, + #{billFlag}, + #{billNo}, + #{billdate}, + #{billType}, + #{billTypeName}, + #{corpId}, + #{corpName}, + #{inoutType}, + #{deptCode}, + #{deptName}, + #{invCode}, + #{invName}, + #{thirdSysFk}, + #{createUser}, + #{createTime}, + #{updateUser}, + #{updateTime}, + #{reviewUser}, + #{reviewTime}, + #{address}, + #{linkMan}, + #{linkTel}, + #{remark}) replace INTO thr_order - (billNo, billdate, corpId, corpName, billType, billFlag, thirdSysFk, updateTime, originType, unitIdFk, - startDate, endDate, createUser, reviewUser, address, linkMan, linkTel, remark, remark1, remark2, - remark3,locStorageCode,editStatus,invWarehouseCode,fromSubInvCode,`type`,allocateStatus) + (billFlag, billNo, billdate, billType, billTypeName, corpId, corpName, inoutType, deptCode, deptName, + invCode, invName, thirdSysFk, createUser, createTime, updateUser, updateTime, reviewUser, reviewTime, address, + linkMan, linkTel, remark) values - (#{item.billNo}, - #{item.billdate}, - #{item.corpId}, - #{item.corpName}, - #{item.billType}, - #{item.billFlag}, - #{item.thirdSysFk}, #{item.updateTime}, #{item.originType}, #{item.unitIdFk}, - #{item.startDate}, #{item.endDate}, #{item.createUser}, #{item.reviewUser}, - #{item.address}, #{item.linkMan}, #{item.linkTel}, #{item.remark}, #{item.remark1}, - #{item.remark2}, - #{item.remark3},#{item.locStorageCode},#{item.editStatus},#{item.invWarehouseCode},#{item.fromSubInvCode},#{item.type},#{item.allocateStatus} - ) + (#{item.billFlag}, + #{item.billNo}, + #{item.billdate}, + #{item.billType}, + #{item.billTypeName}, + #{item.corpId}, + #{item.corpName}, + #{item.inoutType}, + #{item.deptCode}, + #{item.deptName}, + #{item.invCode}, + #{item.invName}, + #{item.thirdSysFk}, + #{item.createUser}, + #{item.createTime}, + #{item.updateUser}, + #{item.updateTime}, + #{item.reviewUser}, + #{item.reviewTime}, + #{item.address}, + #{item.linkMan}, + #{item.linkTel}, + #{item.remark}) @@ -215,40 +154,4 @@ DELETE FROM thr_order - - - UPDATE thr_order - - billNo=#{billNo}, - billdate=#{billdate}, - corpId=#{corpId}, - corpName=#{corpName}, - billType=#{billType}, - billFlag=#{billFlag}, - thirdSysFk=#{thirdSysFk}, - updateTime=#{updateTime}, - originType=#{originType}, - startDate=#{startDate}, - endDate=#{endDate}, - createUser=#{createUser}, - reviewUser=#{reviewUser}, - address=#{address}, - linkMan=#{linkMan}, - linkTel=#{linkTel}, - remark=#{remark}, - remark1=#{remark1}, - remark2=#{remark2}, - remark3=#{remark3}, - locStorageCode=#{locStorageCode}, - editStatus=#{editStatus}, - invWarehouseCode=#{invWarehouseCode}, - fromSubInvCode=#{fromSubInvCode}, - `type`=#{type}, - `allocateStatus`=#{allocateStatus}, - - - WHERE id = #{id} - - - diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml index 3241eab9d..38aab6190 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml @@ -2,10 +2,10 @@ -