From badf66be39c52da3e2340d446397093d3e4f1860 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 21 Dec 2022 17:11:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=B4=AD=EF=BC=8C=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=9B=B8=E5=85=B3bug=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E8=87=AA=E5=8A=A9=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=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}