From badf66be39c52da3e2340d446397093d3e4f1860 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 21 Dec 2022 17:11:46 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=94=B3=E8=B4=AD=EF=BC=8C=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E8=AE=A1=E5=88=92=E7=9B=B8=E5=85=B3bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E9=97=AE=E9=A2=98=EF=BC=8C=E8=87=AA=E5=8A=A9=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E4=B8=80=E4=BA=9B=E4=BB=A3=E7=A0=81=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/admin/constant/ConstantStatus.java | 1 + .../basic/UdiRelevanceController.java | 3 +++ .../inout/OrderDetailController.java | 23 +++++++++++++++++-- .../inventory/InvSubWarehouseController.java | 10 ++++---- .../purchase/PurApplyController.java | 10 +++----- .../api/admin/entity/basic/UdiInfoEntity.java | 4 ++-- .../admin/entity/purchase/PurApplyEntity.java | 2 +- .../req/basic/BusTypeChangeFilterRequest.java | 2 ++ .../req/business/StockOrderFilterRequest.java | 2 ++ .../req/business/StockSelectDataEntity.java | 2 ++ .../admin/req/inout/OrderFilterRequest.java | 2 ++ .../admin/req/purchase/PurApplyRequest.java | 5 +++- .../admin/res/purchase/PurApplyResponse.java | 9 ++++++-- .../mapper/basic/BussinessChangeTypeDao.xml | 17 +++++++------- .../mybatis/mapper/business/StockOrderDao.xml | 9 ++++++-- .../mybatis/mapper/purchase/PurApplyDao.xml | 8 +++++-- .../mapper/purchase/PurApplyDetailDao.xml | 1 - 17 files changed, 77 insertions(+), 33 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java b/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java index 9118e325..9c355a5d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java +++ b/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java @@ -47,6 +47,7 @@ public class ConstantStatus { public static String SORDER_CHECK = "3";//待校验 public static String SORDER_CHECKED = "4";//已校验 public static String SORDER_DELIVER = "5";//已送货 + public static String SORDER_ERROR = "6"; //校验异常 public static final int RECEIVE_UN = 0; //未验收 public static final int RECEIVE_ED = 1; //已验收 diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java index 39b89ba6..7aaf93b9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java @@ -319,6 +319,9 @@ public class UdiRelevanceController { udiInfoEntity.setCpms(udiRelevanceResponse.getCpms()); udiInfoEntity.setPrice(udiRelevanceResponse.getPrice()); udiInfoEntity.setSpmc(udiRelevanceResponse.getSpmc()); + udiInfoEntity.setAllowNoBatch(udiRelevanceResponse.isAllowNoBatch()); + udiInfoEntity.setAllowNoExpire(udiRelevanceResponse.isAllowNoExpire()); + udiInfoEntity.setAllowNoProduct(udiRelevanceResponse.isAllowNoProduct()); udiInfoEntity.setBasicPrductRemak1(udiRelevanceResponse.getBasicPrductRemak1()); udiInfoEntity.setBasicPrductRemak2(udiRelevanceResponse.getBasicPrductRemak2()); udiInfoEntity.setBasicPrductRemak3(udiRelevanceResponse.getBasicPrductRemak3()); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java index 8561ba64..5af9fd2d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java @@ -739,9 +739,10 @@ public class OrderDetailController { } - ErpOrderEntity exitErp = new ContrastErpUtil().vailErpExit(orderDetailService, erpOrderEntities, importErpOrderRequest.getOrderId()); +// ErpOrderEntity exitErp = new ContrastErpUtil().vailErpExit(orderDetailService, erpOrderEntities, importErpOrderRequest.getOrderId()); + OrderEntity exitErp = vialErpExit(docids); if (exitErp != null) { - String errMsg = "所选业务单据" + exitErp.getErpOrderId() + "已被其他出入库单" + exitErp.getOrderIdFk() + "绑定"; + String errMsg = "所选业务单据" + docidStr + "已被其他出入库单" + exitErp.getId() + "绑定"; orderEntity.setRemark(errMsg); orderEntity.setUpdateTime(new Date()); orderService.updateOrder(orderEntity); @@ -761,6 +762,24 @@ public class OrderDetailController { return ResultVOUtils.success("导入成功"); } + public OrderEntity vialErpExit(List docids) { + + + if (CollUtil.isNotEmpty(docids)) { + for (ErpOrderResponse erpOrderResponse : docids) { + + OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); + orderFilterRequest.setErpFk(erpOrderResponse.getBillNo()); + List orderEntities = orderService.findAllOrders(orderFilterRequest); + if (CollUtil.isNotEmpty(orderEntities)) { + return orderEntities.get(0); + } + } + } + return null; + } + + @AuthRuleAnnotation("") @PostMapping("/warehouse/repeatPrintCheck")//TODO 重新校验 public BaseResponse repeatPrintCheck(@RequestBody FilterErpOrderRequest filterErpOrderRequest, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java index d4b62fcc..ffa4add1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java @@ -78,17 +78,17 @@ public class InvSubWarehouseController { AuthAdmin authAdmin = customerService.getUserBean(); if (StrUtil.isNotEmpty(filterInvWarehouseRequest.getPcode())) { - if (filterInvWarehouseRequest.getFilter() == null || filterInvWarehouseRequest.getFilter() == 1) { + if (filterInvWarehouseRequest.getFilter() == null || filterInvWarehouseRequest.getFilter() == 1 || filterInvWarehouseRequest.getFilter() == 2) { if (authAdmin.getCustomerId() == 110) { filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue()); } else { filterInvWarehouseRequest.setSpUse(true); } } - } else{ - if(filterInvWarehouseRequest.getFilter()==3 && filterInvWarehouseRequest.getFilter()!=null){ - filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue()); - }else{ + } else { + if (filterInvWarehouseRequest.getFilter() == 3 && filterInvWarehouseRequest.getFilter() != null) { + filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue()); + } else { //走这边表示单据选择的是往来单位里面调出调入的库 //判断单据类型是1就是设置单据需要需要查询除自己以外的分库 SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("corp_innor_inv"); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurApplyController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurApplyController.java index 5c4edc54..371867f1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurApplyController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurApplyController.java @@ -168,12 +168,7 @@ public class PurApplyController { purPlanEntity.setBillNo(billNo); purPlanEntity.setBillDate(new Date()); purPlanEntity.setStatus(ConstantStatus.APPLY_DRAFT); -// purPlanEntity.setLocStorageCode(purApplyEntity.getTargetInv()); -// purPlanEntity.setInvWarehouseCode(purApplyEntity.getTargetSubInv()); purPlanEntity.setBillType("purPlan"); -// purPlanEntity.setBillType(purApplyEntity.getTargetBillType()); -// purPlanEntity.setDeptCode(purApplyEntity.getDeptCode()); -// purPlanEntity.setCreateBy(purApplyEntity.getAuditBy()); purPlanEntity.setCreateTime(new Date()); purPlanEntity.setUpdateTime(new Date()); purPlanEntity.setApplyBillNo(purApplyEntity.getBillNo()); @@ -182,8 +177,9 @@ public class PurApplyController { purPlanEntity.setApplyAuditBy(purApplyEntity.getAuditBy()); purPlanEntity.setRemark("申购科室：" + purApplyRequest.getSubInvName() + ";申购人：" + purApplyRequest.getCreateByName() + ";申购原因：" + purApplyRequest.getRemark()); - - + purApplyEntity.setPlanBillNo(purPlanEntity.getBillNo()); + purApplyEntity.setGeneratePlan(true); + purApplyService.update(purApplyEntity); purPlanService.insert(purPlanEntity); List purApplyDetailEntities = purApplyDetailService.findByOrderId(purApplyEntity.getId() + ""); if (CollUtil.isNotEmpty(purApplyDetailEntities)) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java index 97dcaf19..07e136e6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java @@ -306,11 +306,11 @@ public class UdiInfoEntity { this.versionNumber = versionNumber; } - public int getDiType() { + public Integer getDiType() { return diType; } - public void setDiType(int diType) { + public void setDiType(Integer diType) { this.diType = diType; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurApplyEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurApplyEntity.java index 157e8118..8724afc9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurApplyEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurApplyEntity.java @@ -76,7 +76,7 @@ public class PurApplyEntity { private String targetSubInv; private String targetBillType; - private String planBillNo; //生成采购计划单据号 + private boolean generatePlan; //是否已生成采购计划单 } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BusTypeChangeFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BusTypeChangeFilterRequest.java index 53659626..2d903a34 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BusTypeChangeFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BusTypeChangeFilterRequest.java @@ -9,4 +9,6 @@ public class BusTypeChangeFilterRequest extends ListPageRequest { private String action; private String originAction; private String name; + private String originName; + private String targetName; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderFilterRequest.java index a09754b9..6bb0a620 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderFilterRequest.java @@ -47,4 +47,6 @@ public class StockOrderFilterRequest extends ListPageRequest { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String endDate; + + private Boolean filterNoSelect; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockSelectDataEntity.java b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockSelectDataEntity.java index 5636ef78..b6de7bd7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockSelectDataEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockSelectDataEntity.java @@ -9,4 +9,6 @@ public class StockSelectDataEntity { private String expireDate; private String productDate; private String supId; + private String zczbhhzbapzbh; + private Integer count; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java index a974b6fc..541c2bef 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java @@ -48,5 +48,7 @@ public class OrderFilterRequest extends ListPageRequest { private boolean entrust; private String invWarehouseCode; + private String erpFk; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurApplyRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurApplyRequest.java index c112a398..8f9b09cd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurApplyRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurApplyRequest.java @@ -17,6 +17,7 @@ import java.util.Date; public class PurApplyRequest extends ListPageRequest { + /** * */ @@ -102,7 +103,9 @@ public class PurApplyRequest extends ListPageRequest { private String startDate; private String endDate; - + private Integer generatePlan; private boolean audtoPlan; + private Integer applyType; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurApplyResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurApplyResponse.java index 990f25aa..0a97e1f0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurApplyResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurApplyResponse.java @@ -8,6 +8,7 @@ import java.util.Date; public class PurApplyResponse { + /** * */ @@ -69,7 +70,11 @@ public class PurApplyResponse { private String subInvName; private String auditRemark; - private String planBillNo; //生成采购计划单据号 + private String targetInv; + private String targetSubInv; + private String targetBillType; - private boolean audtoPlan; + private String planBillNo; //生成采购计划单据号 + private boolean generatePlan; + private boolean audtoPlan; /// } diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessChangeTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessChangeTypeDao.xml index 2bf90986..f499bfd6 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessChangeTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessChangeTypeDao.xml @@ -20,25 +20,26 @@ diff --git a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml index 3cab13e7..a9e8a789 100644 --- a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml @@ -95,7 +95,8 @@ UPDATE stock_order - SET `status` = #{status},`updateTime` = #{updateTime} + SET `status` = #{status}, + `updateTime` = #{updateTime} where id = #{orderId} @@ -216,9 +217,13 @@ and inv_warehouse_user.userId =#{userId} + + + and stock_order.orderIdFk is null + group by stock_order.id - ORDER BY updateTime DESC + ORDER BY stock_order.billdate DESC diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml index 12bf3d66..dceadf42 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml @@ -47,6 +47,9 @@ AND createBy = #{createBy} + + AND generatePlan = 1 + @@ -57,7 +60,7 @@ INTO pur_apply ( billNo,billDate,status,billType,remark,locStorageCode,invWarehouseCode, - deptCode,createBy,createTime,auditBy,auditTime,updateTime,auditRemark,targetInv,targetSubInv,targetBillType,planBillNo + deptCode,createBy,createTime,auditBy,auditTime,updateTime,auditRemark,targetInv,targetSubInv,targetBillType,planBillNo,generatePlan ) values ( #{billNo}, @@ -77,7 +80,7 @@ #{targetInv}, #{targetSubInv}, #{targetBillType}, - #{planBillNo} + #{planBillNo},#{generatePlan} ) @@ -117,6 +120,7 @@ targetSubInv=#{targetSubInv}, targetBillType=#{targetBillType}, planBillNo=#{planBillNo}, + generatePlan=#{generatePlan}, WHERE id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml index bdb115fc..45c0910f 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml @@ -33,7 +33,6 @@ AND orderIdFk = #{orderIdFk} - AND basic_products.diType=1 AND productId = #{productId} From 95a2747c090f62bdf07080f3c67d5fc10b612ff1 Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 21 Dec 2022 22:35:36 +0800 Subject: [PATCH 2/7] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=85=BB=E6=8A=A4?= =?UTF-8?q?=E7=AD=89=E7=9B=B8=E5=85=B3=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/inventory/impl/InvMAOrderDetailServiceImpl.java | 5 +++-- .../mybatis/mapper/inventory/InvMaintenanceOrderDao.xml | 3 ++- .../mapper/inventory/InvMaintenanceOrderDetailDao.xml | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderDetailServiceImpl.java index 853b0358..8ba65104 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderDetailServiceImpl.java @@ -116,9 +116,10 @@ public class InvMAOrderDetailServiceImpl implements InvMAOrderDetailService { if (invMaintenanceOrderDetailEntity.getCount() > 1) { invMaintenanceOrderDetailEntity.setCount(invMaintenanceOrderDetailEntity.getCount() - 1); invMAOrderDetailDao.updateByPrimaryKey(invMaintenanceOrderDetailEntity); + } else { + //养护数量为1，直接删除养护记录详情 + invMAOrderDetailDao.deleteByPrimaryKey(id); } - //养护数量为1，直接删除养护记录详情 - invMAOrderDetailDao.deleteByPrimaryKey(id); return ResultVOUtils.success(); } diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDao.xml index daf7eaf7..17324435 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDao.xml @@ -192,7 +192,8 @@ inv_space.name invSpaceName from inv_maintenance_order ma left join inv_warehouse_sub on ma.invWarehouseCode = inv_warehouse_sub.code - left join inv_space on ma.invSpaceCode = inv_space.code + left join inv_space + on ma.invSpaceCode = inv_space.code and inv_warehouse_sub.code = inv_space.invWarehouseCode AND ma.id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDetailDao.xml index 658398f1..b6b8e780 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDetailDao.xml @@ -241,7 +241,7 @@ mad.createTime, mad.updateTime, basic_products.cpmctymc productName, - ip.ggxh, + basic_products.ggxh, basic_products.zczbhhzbapzbh, basic_products.ylqxzcrbarmc FROM inv_maintenance_order_detail mad From be6e05d87c6d3723d59c7d3d64707e2b1c5c3795 Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 22 Dec 2022 14:54:37 +0800 Subject: [PATCH 3/7] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E8=BD=AC=E5=8D=95=E6=9D=A1=E7=A0=81=E7=BB=91=E5=AE=9A=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E4=BE=9B=E5=BA=94=E5=95=86=E6=97=B6=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E7=9A=84=E9=97=AE=E9=A2=98=202.=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=9B=B4=E6=96=B0=E5=8D=95=E6=8D=AE=E5=A4=87=E6=B3=A8?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=97=A0=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/StockOrderController.java | 10 +++- .../controller/inout/OrderController.java | 25 +++++++- .../inventory/InvSpaceController.java | 2 +- .../dao/basic/CompanyProductRelevanceDao.java | 8 +++ .../api/admin/dao/business/InvSpaceDao.java | 2 +- .../glxp/api/admin/dao/inout/OrderDao.java | 17 ++++++ .../dao/inventory/InvProductDetailDao.java | 2 +- .../admin/res/inout/StockOrderResponse.java | 3 + .../api/admin/service/inout/OrderService.java | 17 ++++++ .../service/inout/impl/OrderServiceImpl.java | 17 ++++-- .../service/inventory/InvSpaceService.java | 2 +- .../impl/InvCountOrderServiceImpl.java | 58 ++++++++++++++----- .../inventory/impl/InvSpaceServiceImpl.java | 2 +- .../api/admin/thread/IoTransInoutService.java | 27 +++------ .../basic/CompanyProductRelevanceDao.xml | 3 + .../mybatis/mapper/business/InvSpaceDao.xml | 12 ++-- .../mybatis/mapper/inout/OrderDao.xml | 7 +++ .../mapper/inventory/InvProductDetailDao.xml | 2 +- 18 files changed, 163 insertions(+), 53 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java index a34827e0..084f5a9a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java @@ -32,7 +32,9 @@ import com.glxp.api.admin.req.business.StockOrderIdsRequest; import com.glxp.api.admin.req.business.StockOrderPostRequest; import com.glxp.api.admin.req.inout.AddStockOrderChangeRequest; import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.inventory.*; +import com.glxp.api.admin.req.inventory.FilterInvUserRequest; +import com.glxp.api.admin.req.inventory.InnerOrderDetailRequest; +import com.glxp.api.admin.req.inventory.PostStockPrintRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.UdiRelevanceResponse; import com.glxp.api.admin.res.business.StockOrderExportResponse; @@ -48,7 +50,6 @@ import com.glxp.api.admin.service.business.StockOrderDetailService; import com.glxp.api.admin.service.business.StockOrderDetailTempService; import com.glxp.api.admin.service.business.StockOrderService; import com.glxp.api.admin.service.business.StockQRCodeTextService; -import com.glxp.api.admin.service.info.CompanyService; import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.service.inout.CodesService; import com.glxp.api.admin.service.inout.CodesTempService; @@ -328,9 +329,12 @@ public class StockOrderController { //判断订单是否可以补单 List resultList = orderService.checkSupplementOrder(stockOrderEntityList); + //查询补单设置 + orderService.checkSubmitOrder(resultList); //查询仓库名称 orderService.queryInvName(resultList); - resultList = orderService.checkSubmitOrder(resultList); + //查询单据备注 + orderService.queryPrintRemark(resultList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(resultList); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java index 70e1ce78..16a21100 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java @@ -19,7 +19,10 @@ import com.glxp.api.admin.entity.basic.EntrustReceEntity; import com.glxp.api.admin.entity.basic.UdiEntity; import com.glxp.api.admin.entity.business.StockOrderEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.entity.inout.*; +import com.glxp.api.admin.entity.inout.ErpOrderEntity; +import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; +import com.glxp.api.admin.entity.inout.OrderEntity; +import com.glxp.api.admin.entity.inout.WarehouseEntity; import com.glxp.api.admin.entity.inventory.InvBusUserEntity; import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; import com.glxp.api.admin.httpclient.SpsDirectClient; @@ -27,7 +30,6 @@ import com.glxp.api.admin.req.basic.BasicEntrustRecRequest; import com.glxp.api.admin.req.business.StockOrderFilterRequest; import com.glxp.api.admin.req.inout.*; import com.glxp.api.admin.req.inventory.FilterInvBusUserRequest; -import com.glxp.api.admin.req.inventory.FilterInvUserRequest; import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest; import com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest; import com.glxp.api.admin.res.PageSimpleResponse; @@ -207,6 +209,25 @@ public class OrderController { return ResultVOUtils.success("更新成功"); } + /** + * 更新单据备注 + * + * @param orderEntity + * @param bindingResult + * @return + */ + @PostMapping("/udiwms/inout/order/updateOrderPrintRemark") + public BaseResponse updateOrderRemark(@RequestBody OrderEntity orderEntity, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + boolean b = orderService.updatePrintRemark(orderEntity.getId(), orderEntity.getPrintRemark()); + if (!b) { + return ResultVOUtils.error(500, "单据备注更新失败！"); + } + return ResultVOUtils.success("更新成功"); + } + @AuthRuleAnnotation("") @PostMapping("/udiwms/inout/order/updateUnit") diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSpaceController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSpaceController.java index 39f54748..74010160 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSpaceController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSpaceController.java @@ -98,7 +98,7 @@ public class InvSpaceController { */ @GetMapping("/spms/inv/space/getSpaceCodeList") public BaseResponse getSpaceCodeList(FilterInvSpaceRequest filterInvSpaceRequest) { - List list = invSpaceService.getSpaceCodeList(filterInvSpaceRequest); + List list = invSpaceService.getSpaceCodeList(filterInvSpaceRequest); return ResultVOUtils.success(list); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CompanyProductRelevanceDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CompanyProductRelevanceDao.java index f2d935d0..3c32fb59 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CompanyProductRelevanceDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CompanyProductRelevanceDao.java @@ -35,4 +35,12 @@ public interface CompanyProductRelevanceDao { boolean deleteById(String id); boolean deleteByRlId(String id); + + /** + * 根据产品ID查询供应商ID + * + * @param udiRlIdFk + * @return + */ + List selectUnitFkByUdiRlIdFk(@Param("udiRlIdFk") String udiRlIdFk); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/business/InvSpaceDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/business/InvSpaceDao.java index bddca773..f84b81d4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/business/InvSpaceDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/business/InvSpaceDao.java @@ -48,7 +48,7 @@ public interface InvSpaceDao { * @param filterInvSpaceRequest * @return */ - List selectSpaceCodeList(FilterInvSpaceRequest filterInvSpaceRequest); + List selectSpaceCodeList(FilterInvSpaceRequest filterInvSpaceRequest); /** * 根据货位码查询此 diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDao.java index 8f32773a..ef479b7c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDao.java @@ -100,4 +100,21 @@ public interface OrderDao { * @return */ List selectByBillNoAndStatus(String billNo); + + /** + * 更新单据备注 + * + * @param orderId 单据号 + * @param printRemark 备注信息 + * @return + */ + boolean updatePrintRemark(@Param("orderId") String orderId, @Param("printRemark") String printRemark); + + /** + * 查询单据备注 + * + * @param orderId + * @return + */ + String selectPrintRemarkById(@Param("orderId") String orderId); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvProductDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvProductDetailDao.java index ee6b892c..9c936941 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvProductDetailDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvProductDetailDao.java @@ -100,6 +100,6 @@ public interface InvProductDetailDao { * @param code * @return */ - String selectSupIdByCode(String code); + List selectSupIdByCode(String code); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inout/StockOrderResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/inout/StockOrderResponse.java index 1e2282d8..33de8e80 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inout/StockOrderResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/inout/StockOrderResponse.java @@ -21,4 +21,7 @@ public class StockOrderResponse extends StockOrderEntity { //当前分库名称 private String invWarehouseName; + //单据备注 + private String printRemark; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/OrderService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/OrderService.java index 6c14a45c..acfce749 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/OrderService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/OrderService.java @@ -138,4 +138,21 @@ public interface OrderService { * @param responseList */ void queryInvName(List responseList); + + /** + * 更新单据备注 + * + * @param id + * @param printRemark + * @return + */ + boolean updatePrintRemark(String id, String printRemark); + + /** + * 查询单据备注 + * + * @param resultList + */ + void queryPrintRemark(List resultList); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java index 953bc848..1e8f0d00 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java @@ -406,10 +406,6 @@ public class OrderServiceImpl implements OrderService { @Override public List checkSubmitOrder(List orderResponseList) { - if (CollUtil.isEmpty(orderResponseList)) { - return Collections.emptyList(); - } - //查询第三方系统的 List actions = new ArrayList<>(); for (StockOrderResponse stockOrderResponse : orderResponseList) { @@ -539,6 +535,19 @@ public class OrderServiceImpl implements OrderService { } } + @Override + public boolean updatePrintRemark(String orderId, String printRemark) { + return orderDao.updatePrintRemark(orderId, printRemark); + } + + @Override + public void queryPrintRemark(List resultList) { + for (StockOrderResponse stockOrderResponse : resultList) { + String printRemark = orderDao.selectPrintRemarkById(stockOrderResponse.getOrderIdFk()); + stockOrderResponse.setPrintRemark(printRemark); + } + } + @Transactional(rollbackFor = Exception.class) @Override public void deleteOrders(List ids) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSpaceService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSpaceService.java index 7605c177..2ce2a25d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSpaceService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSpaceService.java @@ -41,7 +41,7 @@ public interface InvSpaceService { */ BaseResponse updateSpace(InvSpace invSpace); - List getSpaceCodeList(FilterInvSpaceRequest filterInvSpaceRequest); + List getSpaceCodeList(FilterInvSpaceRequest filterInvSpaceRequest); /** * 根据分库编码查询货位信息 diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderServiceImpl.java index d044f49f..a72e3173 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderServiceImpl.java @@ -11,6 +11,7 @@ import com.glxp.api.admin.constant.Constant; import com.glxp.api.admin.constant.ConstantStatus; import com.glxp.api.admin.constant.ConstantType; import com.glxp.api.admin.dao.basic.BussinessTypeDao; +import com.glxp.api.admin.dao.basic.CompanyProductRelevanceDao; import com.glxp.api.admin.dao.basic.UnitMaintainDao; import com.glxp.api.admin.dao.inout.CodesDao; import com.glxp.api.admin.dao.inout.CodesTempDao; @@ -73,6 +74,8 @@ public class InvCountOrderServiceImpl implements InvCountOrderService { private InvCountCodesService invCountCodesService; @Resource private CodesDao codesDao; + @Resource + private CompanyProductRelevanceDao companyProductRelevanceDao; @Override public List filterList(FilterInvCountOrderRequest filterInvCountOrderRequest) { @@ -299,7 +302,7 @@ public class InvCountOrderServiceImpl implements InvCountOrderService { warehouseEntity.setReCount(codeNum); //设置供应商信息 - setSupInfo(warehouseEntity); + setSupInfo(warehouseEntity, "loss"); outOrderCodes.add(warehouseEntity); } else { for (InvProductDetailEntity invProductDetailEntity : invProductDetailEntities) { @@ -323,7 +326,7 @@ public class InvCountOrderServiceImpl implements InvCountOrderService { } //设置供应商信息 - setSupInfo(warehouseEntity); + setSupInfo(warehouseEntity, "loss"); outOrderCodes.add(warehouseEntity); } } @@ -362,11 +365,11 @@ public class InvCountOrderServiceImpl implements InvCountOrderService { UdiEntity udi = FilterUdiUtils.getUdi(countCodesList.get(0)); //修改码数量 int actCount = invCountCodesService.getActCount(udi.getUdi()); - //使用此盘点单据详情的盘亏数量 / 实际数量，计算得出扫码数量 + //使用此盘点单据详情的盘盈数量 / 实际数量，计算得出扫码数量 int codeNum = invCountOrderDetail.getProfitNum() / actCount; warehouseEntity.setCount(codeNum); warehouseEntity.setReCount(codeNum); - setSupInfo(warehouseEntity); + setSupInfo(warehouseEntity, "profit"); inOrderCodes.add(warehouseEntity); } else { for (String code : profitCodes) { @@ -378,7 +381,7 @@ public class InvCountOrderServiceImpl implements InvCountOrderService { if ((StrUtil.isBlank(udi.getBatchNo()) && StrUtil.isBlank(udi.getSerialNo())) || (StrUtil.isBlank(udi.getSerialNo()) && StrUtil.isNotBlank(udi.getBatchNo()))) { //修改码数量 int actCount = invCountCodesService.getActCount(udi.getUdi()); - //使用此盘点单据详情的盘亏数量 / 实际数量，计算得出扫码数量 + //使用此盘点单据详情的盘盈数量 / 实际数量，计算得出扫码数量 int codeNum = invCountOrderDetail.getProfitNum() / actCount; warehouseEntity.setCount(codeNum); warehouseEntity.setReCount(codeNum); @@ -388,7 +391,7 @@ public class InvCountOrderServiceImpl implements InvCountOrderService { warehouseEntity.setCount(actCount); warehouseEntity.setReCount(actCount); } - setSupInfo(warehouseEntity); + setSupInfo(warehouseEntity, "profit"); inOrderCodes.add(warehouseEntity); } } @@ -444,16 +447,41 @@ public class InvCountOrderServiceImpl implements InvCountOrderService { /** * 对条码添加供应商信息 * - * @param warehouseEntity + * @param warehouseEntity 码明细 + * @param countStatus 盈亏状态 */ - private void setSupInfo(WarehouseEntity warehouseEntity) { - //设置供应商参数 - String supId = invProductDetailDao.selectSupIdByCode(warehouseEntity.getCode()); - if (StrUtil.isNotEmpty(supId)) { - warehouseEntity.setSupId(supId); - //查询供应商名称 - String name = unitMaintainDao.selectNameByErpId(supId); - warehouseEntity.setSupName(name); + private void setSupInfo(WarehouseEntity warehouseEntity, String countStatus) { + /** + * 根据此码明细的盈亏状态，使用不同的逻辑生成供应商信息 + * 盘盈：此条码不存在于库存详情中，需要从供应商产品信息表查询供应商信息 + * 盘亏：此条码在库存中存在，但是盘点中没有此条码，直接查询库存详情表中的供应商ID + * + * 若查询出的供应商信息多余1条，则表明此产品被多个供应商绑定，在此处不进行绑定，单据生成之后会进入异常单据页面，在异常单据页面手动指定供应商 + */ + if (countStatus.equals("loss")) { + log.info("生成盘亏单据条码供应商详情，条码信息：{}", warehouseEntity.getCode()); + List supIds = invProductDetailDao.selectSupIdByCode(warehouseEntity.getCode()); + if (CollUtil.isNotEmpty(supIds)) { + if (supIds.size() == 1) { + //此产品只绑定了一个供应商，若绑定了多个供应商，则不填供应商ID字段，生成单据之后会进入异常单据页面，手动指定供应商 + warehouseEntity.setSupId(supIds.get(0)); + //查询供应商名称 + String name = unitMaintainDao.selectNameByErpId(supIds.get(0)); + warehouseEntity.setSupName(name); + } + } + } else { + log.info("生成盘盈单据条码供应商详情，条码信息：{}", warehouseEntity.getCode()); + List unitFkList = companyProductRelevanceDao.selectUnitFkByUdiRlIdFk(warehouseEntity.getRelId()); + if (CollUtil.isNotEmpty(unitFkList)) { + if (unitFkList.size() == 1) { + //此产品只绑定了一个供应商，若绑定了多个供应商，则不填供应商ID字段，生成单据之后会进入异常单据页面，手动指定供应商 + warehouseEntity.setSupId(unitFkList.get(0)); + //查询供应商名称 + String name = unitMaintainDao.selectNameByErpId(unitFkList.get(0)); + warehouseEntity.setSupName(name); + } + } } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSpaceServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSpaceServiceImpl.java index 81eb1c97..85d2e0d6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSpaceServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSpaceServiceImpl.java @@ -125,7 +125,7 @@ public class InvSpaceServiceImpl implements InvSpaceService { } @Override - public List getSpaceCodeList(FilterInvSpaceRequest filterInvSpaceRequest) { + public List getSpaceCodeList(FilterInvSpaceRequest filterInvSpaceRequest) { return invSpaceDao.selectSpaceCodeList(filterInvSpaceRequest); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java index b39909c4..29051f2a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java @@ -7,16 +7,15 @@ import com.glxp.api.admin.constant.Constant; import com.glxp.api.admin.constant.ConstantStatus; import com.glxp.api.admin.constant.ConstantType; import com.glxp.api.admin.controller.inout.utils.CheckOrderUtils; -import com.glxp.api.admin.controller.inout.utils.ContrastErpUtil; -import com.glxp.api.admin.controller.inout.utils.DataTransUtil; import com.glxp.api.admin.controller.inout.utils.InoutUtils; import com.glxp.api.admin.dao.business.StockOrderRemakDao; -import com.glxp.api.admin.entity.basic.*; +import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; +import com.glxp.api.admin.entity.basic.BussinessTypeEntity; +import com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity; +import com.glxp.api.admin.entity.basic.UdiEntity; import com.glxp.api.admin.entity.business.StockOrderDetailEntity; import com.glxp.api.admin.entity.business.StockOrderEntity; import com.glxp.api.admin.entity.business.StockOrderRemakEntity; -import com.glxp.api.admin.entity.info.CompanyEntity; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; import com.glxp.api.admin.entity.inout.ErpOrderEntity; import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; import com.glxp.api.admin.entity.inout.OrderEntity; @@ -24,41 +23,33 @@ import com.glxp.api.admin.entity.inout.WarehouseEntity; import com.glxp.api.admin.entity.inventory.InvProductDetailEntity; import com.glxp.api.admin.entity.inventory.InvProductEntity; import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; -import com.glxp.api.admin.httpclient.ErpOrderClient; -import com.glxp.api.admin.httpclient.UdiDlHttpClient; import com.glxp.api.admin.req.basic.CompanyProductRelevanceRequest; import com.glxp.api.admin.req.basic.FilterCompanyProductRelevanceRequest; -import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; import com.glxp.api.admin.req.business.StockOrderFilterRequest; import com.glxp.api.admin.req.inout.CommitRequest; import com.glxp.api.admin.req.inout.OrderFilterRequest; import com.glxp.api.admin.req.inout.PostOrderRequest; import com.glxp.api.admin.req.inout.WarehouseQueryRequest; -import com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest; import com.glxp.api.admin.req.inventory.FilterInvProductRequest; import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest; -import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse; import com.glxp.api.admin.res.basic.UdiRelevanceResponse; import com.glxp.api.admin.res.info.CompanyProductRelevanceResponse; -import com.glxp.api.admin.service.basic.*; +import com.glxp.api.admin.service.basic.BasicUnitMaintainService; +import com.glxp.api.admin.service.basic.BussinessTypeService; +import com.glxp.api.admin.service.basic.UdiInfoService; +import com.glxp.api.admin.service.basic.UdiRelevanceService; import com.glxp.api.admin.service.business.StockOrderDetailService; import com.glxp.api.admin.service.business.StockOrderService; import com.glxp.api.admin.service.info.CompanyProductRelevanceService; -import com.glxp.api.admin.service.info.CompanyService; -import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.service.inout.CodesService; import com.glxp.api.admin.service.inout.CodesTempService; import com.glxp.api.admin.service.inout.OrderDetailService; import com.glxp.api.admin.service.inout.OrderService; import com.glxp.api.admin.service.inventory.*; -import com.glxp.api.admin.service.thrsys.ThrDataService; -import com.glxp.api.admin.service.thrsys.ThrOrderService; import com.glxp.api.admin.util.*; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -528,7 +519,7 @@ public class IoTransInoutService { if (originSupId != null) { warehouseEntity.setSupId(originSupId); } - if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && warehouseEntity.getRelId() == null) {//同一个DI绑定多个产品西信息 + if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && warehouseEntity.getRelId() == null) {//同一个DI绑定多个产品信息 warehouseEntity.setRelId(null); warehouseEntity.setStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI); } else if (udiRelevanceEntities == null || udiRelevanceEntities.size() == 0) {//未找到产品信息，一般不会出现 diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml index 1120658b..1a99b4de 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml @@ -297,4 +297,7 @@ WHERE udiRlIdFk = #{id} + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/business/InvSpaceDao.xml b/api-admin/src/main/resources/mybatis/mapper/business/InvSpaceDao.xml index 03f35383..6c32739a 100644 --- a/api-admin/src/main/resources/mybatis/mapper/business/InvSpaceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/business/InvSpaceDao.xml @@ -315,18 +315,20 @@ - + select inv_space.code, inv_space.name, iws.name invSubStorageName, iw.name invStorageName from inv_space + left join inv_warehouse_sub iws on iws.code = inv_space.invWarehouseCode + left join inv_warehouse iw on iw.code = inv_space.invStorageCode - AND invStorageCode = #{invStorageCode} + AND inv_space.invStorageCode = #{invStorageCode} - AND invWarehouseCode = #{invWarehouseCode} + AND inv_space.invWarehouseCode = #{invWarehouseCode} - AND status = #{status} + AND inv_space.status = #{status} diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml index 234cd6db..e44d966d 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -671,4 +671,11 @@ and (io_order.id = #{billNo} or io_order.erpFk = #{billNo}) + + update io_order set printRemark = #{printRemark} where id = #{orderId} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDetailDao.xml index 4959ec2a..933c1db1 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDetailDao.xml @@ -434,6 +434,6 @@ \ No newline at end of file From 118efa8b27d42ff26af9aadea04cea5d0fc70f0f Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 22 Dec 2022 15:18:27 +0800 Subject: [PATCH 4/7] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E9=A2=86=E7=94=A8=E5=85=BB=E6=8A=A4=E8=87=AA=E5=8A=A8=E5=BB=BA?= =?UTF-8?q?=E8=A1=A8=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/schemas/schema_v2.1.sql | 78 +++++++++++++++---- 1 file changed, 65 insertions(+), 13 deletions(-) diff --git a/api-admin/src/main/resources/schemas/schema_v2.1.sql b/api-admin/src/main/resources/schemas/schema_v2.1.sql index 5e1cb9b7..47e273e3 100644 --- a/api-admin/src/main/resources/schemas/schema_v2.1.sql +++ b/api-admin/src/main/resources/schemas/schema_v2.1.sql @@ -5,24 +5,76 @@ CALL Pro_Temp_ColumnWork ('io_order','wzUploadResult','varchar(255) ', 1); CALL Pro_Temp_ColumnWork ('sup_cert','filePath','varchar(255) ', 2); -INSERT -ignore INTO sys_scheduled(id, cronName, cron, customerId, remark) -VALUES -(16, 'ScheduledDeletion', '0 0 2 1/1 * ? ', NULL, '删除30天数据'); -INSERT -ignore INTO sys_param_config ( id, parentId, paramName, paramKey, paramValue, paramStatus, paramType, paramExplain ) -VALUES - ( 20009, 0, '删除30天数据', 'ScheduledDeletion', '1', 1, 0, '1:是，0：否' ); +-- 创建表时必须 create table if not exists 表名 +CREATE TABLE if not exists `device_collect_order` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', + `orderId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '领用记录号', + `deptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '领用部门', + `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', + `auditUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '审核人', + `createTime` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '领用时间', + `updateTime` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新时间', + `status` tinyint(1) NULL DEFAULT NULL COMMENT '状态 0：草稿 1：未审核 2：已审核', + `collectUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '领用人', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 9 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备领用记录表' ROW_FORMAT = Dynamic; -INSERT -ignore INTO sys_scheduled (`cronName`, `cron`, `customerId`, `remark`) VALUES ('downloadSpDataTask', '0 0/1 * * * ?', NULL, '立即下载自助平台数据'); -ALTER TABLE pur_plan - MODIFY COLUMN `billType` varchar(255) NULL DEFAULT NULL COMMENT '申购类型' AFTER `status`; +CREATE TABLE if not exists `device_collect_order_detail` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', + `orderIdFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '设备领用记录号', + `originCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '原始码', + `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '码', + `productId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品ID', + `nameCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品DI', + `batchNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '批次号', + `produceDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产日期', + `expireDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '失效日期', + `serialNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '序列号', + `createTime` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '领用时间', + `updateTime` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新时间', + `invWarehouseCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '领用分库', + `invStorageCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '领用仓库', + `invSpaceCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '领用货位', + `receiveWarehouseCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '接收分库', + `receiveStorageCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '接收仓库', + `receiveSpaceCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '接收货位', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 11 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备领用记录详情' ROW_FORMAT = Dynamic; +CREATE TABLE if not exists `device_ma_order` ( + `id` int NOT NULL AUTO_INCREMENT, + `orderId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '设备养护记录号', + `collOrderId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '设备领用单据号', + `createTime` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '养护时间', + `updateTime` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新时间', + `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '养护人', + `auditUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '审核人', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '养护说明', + `status` tinyint(1) NULL DEFAULT NULL COMMENT '状态', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备养护记录表' ROW_FORMAT = Dynamic; --- 创建表时必须 create table if not exists 表名 +CREATE TABLE if not exists `device_ma_order_detail` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', + `orderIdFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '设备养护记录号', + `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '条码', + `nameCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品DI', + `productId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品ID', + `batchNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '批次号', + `produceDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产日期', + `expireDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '失效日期', + `serialNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '序列号', + `createTime` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建时间', + `updateTime` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新时间', + `deviceStatus` tinyint(1) NULL DEFAULT NULL COMMENT '设备状态 0：异常 1：正常', + `maintenanceStatus` tinyint(1) NULL DEFAULT NULL COMMENT '养护状态 0：未养护 1：已养护', + `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '养护人', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '养护说明', + `status` tinyint(1) NULL DEFAULT NULL COMMENT '状态', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备养护记录详情表' ROW_FORMAT = Dynamic; -- 删除自助平台表 drop table if exists auth_platform; From 86e64cec5eb2a1f08a247657ab009bcd9b439385 Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 22 Dec 2022 17:41:27 +0800 Subject: [PATCH 5/7] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E5=8D=95=E6=8D=AE=E6=A0=A1=E9=AA=8C=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E4=B8=8D=E5=8C=85=E5=90=AB=E5=BD=93=E5=89=8D=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E6=89=AB=E7=A0=81=E4=BF=A1=E6=81=AF=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E8=B6=85=E5=87=BA=E6=9C=AA=E6=8F=90=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/WareHouseController.java | 8 ++++++- .../inventory/InvProductsController.java | 2 +- .../inventory/InvProductDetailService.java | 2 +- .../impl/InvMAOrderDetailServiceImpl.java | 22 +++++++++++++------ .../impl/InvProductDetailServiceImpl.java | 5 ++++- 5 files changed, 28 insertions(+), 11 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java index e65a8617..0f9ea0e5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java @@ -755,9 +755,15 @@ public class WareHouseController { return ResultVOUtils.error(500, "当前库存不足，不允许0库存出库"); } } else { - int count = invProductDetailService.vailStockCount(code); + int count = invProductDetailService.vailStockCount(code, addOrderRequest.getInvStorageCode(), addOrderRequest.getInvWarehouseCode(), null); if (count <= 0) { return ResultVOUtils.error(500, "当前库存不足，不允许0库存出库"); + } else { + //查询此单据已扫描的条码数量 + WarehouseEntity warehouse = codesTempService.findByUnique(addOrderRequest.getOrderId(), addOrderRequest.getCode()); + if (null != warehouse && warehouse.getCount() > count) { + return ResultVOUtils.error(500, "当前库存不足，不允许0库存出库"); + } } } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvProductsController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvProductsController.java index 9e1240d5..1cced17a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvProductsController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvProductsController.java @@ -431,7 +431,7 @@ public class InvProductsController { @AuthRuleAnnotation("") @GetMapping("spms/inv/products/vailInvCount") public BaseResponse vailInvCount(FilterInvProductDetailRequest filterInvProductDetailRequest) { - int count = invProductDetailService.vailStockCount(filterInvProductDetailRequest.getCode()); + int count = invProductDetailService.vailStockCount(filterInvProductDetailRequest.getCode(), filterInvProductDetailRequest.getInvStorageCode(), filterInvProductDetailRequest.getInvWarehouseCode(), filterInvProductDetailRequest.getInvSpaceCode()); return ResultVOUtils.success(count); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvProductDetailService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvProductDetailService.java index c34abdfe..4d785eb6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvProductDetailService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvProductDetailService.java @@ -38,7 +38,7 @@ public interface InvProductDetailService { InvProductDetailEntity statInvPreInDetail(String code); - int vailStockCount(String code); + int vailStockCount(String code, String invStorageCode, String invWarehouseCode, String invSpaceCode); /** * 查询货物摆放数据列表 diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderDetailServiceImpl.java index 8ba65104..2bbea5bc 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderDetailServiceImpl.java @@ -145,15 +145,23 @@ public class InvMAOrderDetailServiceImpl implements InvMAOrderDetailService { codeList.forEach(code -> codeMap.put(code, 0)); //计算当前在库存中的码明细 for (InvProductDetailEntity invProductDetailEntity : invProductDetailEntities) { - Integer count = codeMap.get(invProductDetailEntity.getOriginCode()); - if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { - //出库 - count = count - 1; + UdiEntity udi = FilterUdiUtils.getUdi(invProductDetailEntity.getOriginCode()); + if (StrUtil.isNotBlank(udi.getSerialNo())) { + //有序列号产品，根据产品数量计算即可 + Integer count = codeMap.get(invProductDetailEntity.getOriginCode()); + if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { + //出库 + count = count - 1; + } else { + //入库 + count = count + 1; + } + codeMap.put(invProductDetailEntity.getOriginCode(), count); } else { - //入库 - count = count + 1; + //无序列号产品条码，直接查询库存，使用此库存信息计算出养护数量 + int count = invProductEntity.getInCount() - invProductEntity.getOutCount(); + codeMap.put(invProductDetailEntity.getOriginCode(), count); } - codeMap.put(invProductDetailEntity.getOriginCode(), count); } //根据库存中的码明细，生成库存养护记录详情 diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductDetailServiceImpl.java index fcc5e7df..bb109dfa 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvProductDetailServiceImpl.java @@ -141,12 +141,15 @@ public class InvProductDetailServiceImpl implements InvProductDetailService { @Override - public int vailStockCount(String code) { + public int vailStockCount(String code, String invStorageCode, String invWarehouseCode, String invSpaceCode) { if (StrUtil.isEmpty(code)) { return 0; } FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest(); filterInvProductDetailRequest.setOriginCode(code); + filterInvProductDetailRequest.setInvStorageCode(invStorageCode); + filterInvProductDetailRequest.setInvWarehouseCode(invWarehouseCode); + filterInvProductDetailRequest.setInvSpaceCode(invSpaceCode); List datas = invProductDetailDao.filterInvProductDetail(filterInvProductDetailRequest); if (CollUtil.isEmpty(datas)) { filterInvProductDetailRequest.setOriginCode(null); From 16bbae8bf9540b2268a025cc7507d6c3d4b97eb2 Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 22 Dec 2022 21:12:08 +0800 Subject: [PATCH 6/7] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E9=A2=86=E7=94=A8=E8=AE=B0=E5=BD=95=E6=9B=B4=E6=96=B0=E5=90=8E?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E4=BA=BA=E5=AD=97=E6=AE=B5=E8=A2=AB=E7=BD=AE?= =?UTF-8?q?=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/inventory/impl/DeviceCollectOrderServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceCollectOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceCollectOrderServiceImpl.java index 7e7aea81..5d3081b7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceCollectOrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceCollectOrderServiceImpl.java @@ -77,7 +77,7 @@ public class DeviceCollectOrderServiceImpl implements DeviceCollectOrderService return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } deviceCollectOrderEntity.setUpdateTime(DateUtil.getDateTime()); - deviceCollectOrderDao.updateByPrimaryKey(deviceCollectOrderEntity); + deviceCollectOrderDao.updateByPrimaryKeySelective(deviceCollectOrderEntity); return ResultVOUtils.success("更新成功"); } From 1afd2b28c9a67e65434dfd902bbfa520fce2d8dd Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 23 Dec 2022 15:13:23 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/admin/controller/inout/OrderDetailController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java index 5af9fd2d..498bb8e4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java @@ -255,6 +255,7 @@ public class OrderDetailController { //第三方单据 BussinessOriginTypeResponse bussinessOriginTypeResponse = bussinessOriginTypeService.finByThirdAction(thrOrderEntity.getBillType()); + if(bussinessOriginTypeResponse!=null){ stockOrderEntity.setBillType(bussinessOriginTypeResponse.getLocalAction()); stockOrderEntity.setId(null); stockOrderEntity.setStatus(ConstantStatus.SORDER_ALLOC);//未提交 @@ -264,6 +265,7 @@ public class OrderDetailController { stockOrderEntity.setSourceType(ConstantStatus.ST_THIRD_SEL);//外部提交 stockOrderEntity.setPrintStatus(ConstantStatus.SORDER_PRINT_UN);//未打印 stockOrderEntity.setBilldate(DateUtil.formatDate(new Date())); + } boolean b = stockOrderService.insertStockOrder(stockOrderEntity); stockOrderEntity = stockOrderService.findByBillNo(billNo); FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest();