From b366783407dfd87f674149be50afbaf9bbdde145 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Wed, 29 Jun 2022 12:29:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E6=89=98=E9=AA=8C=E6=94=B6=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E5=A4=9A=E4=B8=AA=E4=BC=9A=E8=A6=86=E7=9B=96=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=8F=AF=E4=BB=A5=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=A4=9A=E4=B8=AA=E5=A7=94=E6=89=98=E9=AA=8C=E6=94=B6?= =?UTF-8?q?=EF=BC=8C=E9=80=89=E6=8B=A9=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E5=8A=A0=E5=BD=93=E5=89=8D=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E5=88=86=E5=BA=93=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/OrderController.java | 1 + .../inout/OrderDetailController.java | 36 +++++++++---------- .../inout/StockOrderController.java | 13 ------- .../admin/entity/inout/ErpOrderEntity.java | 4 +++ .../req/basic/BasicEntrustRecRequest.java | 2 ++ .../admin/res/inout/ErpOrderResponse.java | 19 ++++++++++ .../mybatis/mapper/basic/EntrustReceDao.xml | 6 ++++ 7 files changed, 49 insertions(+), 32 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java index 736259a..c70335f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java @@ -273,6 +273,7 @@ public class OrderController { basicEntrustRecRequest.setAction(stockOrderEntity.getBillType()); basicEntrustRecRequest.setEntrustUser(userId + ""); basicEntrustRecRequest.setCurInv(stockOrderEntity.getLocStorageCode()); + basicEntrustRecRequest.setInvWarehouseCode(stockOrderEntity.getInvWarehouseCode()); entrustReceEntities = entrustReceService.filterEntrustRec(basicEntrustRecRequest); } else { return ResultVOUtils.error(500, "单据已委托验收完成！"); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java index 1dfda77..9971cb2 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java @@ -164,10 +164,10 @@ public class OrderDetailController { } String billType = null; - if(StrUtil.isNotEmpty(filterErpOrderRequest.getBillAction())){ + if (StrUtil.isNotEmpty(filterErpOrderRequest.getBillAction())) { BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(filterErpOrderRequest.getBillAction()); billType = bussinessTypeEntity.getLocalAction(); - }else { + } else { billType = filterErpOrderRequest.getLocalAction(); } StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest(); @@ -454,6 +454,8 @@ public class OrderDetailController { erpOrderEntity.setBatchNo(subPurchase.getBatchNo()); erpOrderEntity.setErpCount(Math.abs(Integer.parseInt(subPurchase.getCount()))); erpOrderEntity.setReCount(Math.abs(Integer.parseInt(subPurchase.getReCount()))); + erpOrderEntity.setInvWarehouseCode(purchaseinResponse.getInvWarehouseCode()); + erpOrderEntity.setLocStorageCode(purchaseinResponse.getLocStorageCode()); erpOrderEntity.setGoodsunit(subPurchase.getSpec()); erpOrderEntity.setBindRlFk(subPurchase.getRelId()); erpOrderEntities.add(erpOrderEntity); @@ -466,7 +468,16 @@ public class OrderDetailController { ErpOrderEntity temp = erpOrderEntities.get(0); for (int i = 0; i < erpOrderEntities.size(); i++) { if (!temp.getCompanyname().equals(erpOrderEntities.get(i).getCompanyname())) { - return ResultVOUtils.error(500, "选择Erp订单往来单位不一致！"); + return ResultVOUtils.error(500, "所选业务单据往来单位不一致！"); + } + + if (!temp.getLocStorageCode().equals(erpOrderEntities.get(i).getLocStorageCode())) { + return ResultVOUtils.error(500, "所选业务单据当前仓库不一致！"); + } + + + if (!temp.getInvWarehouseCode().equals(erpOrderEntities.get(i).getInvWarehouseCode())) { + return ResultVOUtils.error(500, "所选业务单据当前分库不一致！"); } } @@ -474,12 +485,12 @@ public class OrderDetailController { orderFilterRequest.setId(importErpOrderRequest.getOrderId()); OrderEntity orderEntity = orderService.findOne(orderFilterRequest); long customerId = customerService.getCustomerId(); - if(customerId == 110){ + if (customerId == 110) { orderEntity.setReviewUser(authAdmin.getId().intValue()); } ErpOrderEntity exitErp = new ContrastErpUtil().vailErpExit(orderDetailService, erpOrderEntities, importErpOrderRequest.getOrderId()); if (exitErp != null) { - String errMsg = "所选ERP单" + exitErp.getErpOrderId() + "已被其他出入库单" + exitErp.getOrderIdFk() + "绑定"; + String errMsg = "所选业务单据" + exitErp.getErpOrderId() + "已被其他出入库单" + exitErp.getOrderIdFk() + "绑定"; orderEntity.setRemark(errMsg); orderEntity.setUpdateTime(new Date()); orderService.updateOrder(orderEntity); @@ -493,26 +504,13 @@ public class OrderDetailController { transInoutService.genOrderDetail(warehouseEntityList); checkOrderUtils.check(orderEntity.getId(), erpOrderEntities); } else { - return ResultVOUtils.error(500, "ERP订单不能为空"); + return ResultVOUtils.error(500, "业务单据不能为空"); } return ResultVOUtils.success("导入成功"); } -// @PostMapping("/warehouse/repeatCheck")//TODO 重新校验 -// public BaseResponse repeatCheck(@RequestBody FilterErpOrderRequest filterErpOrderRequest, BindingResult bindingResult) { -// -// if (bindingResult.hasErrors()) { -// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); -// } -// OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); -// orderFilterRequest.setId(filterErpOrderRequest.getOrderId()); -// OrderEntity orderEntity = orderService.findOne(orderFilterRequest); -// transInoutService.repeatCheck(orderEntity.getId()); -// return ResultVOUtils.success("后台已开始校验，请稍后刷新重试！"); -// } - @AuthRuleAnnotation("") @PostMapping("/warehouse/repeatPrintCheck")//TODO 重新校验 public BaseResponse repeatPrintCheck(@RequestBody FilterErpOrderRequest filterErpOrderRequest, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java index a1514b0..3f00063 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java @@ -316,19 +316,6 @@ public class StockOrderController { Integer userId = customerService.getUserId(); stockOrderFilterRequest.setUnitIdFk(null); stockOrderFilterRequest.setUserId(userId); -// if (StrUtil.isNotEmpty(stockOrderFilterRequest.getLocStorageCode())) { -// InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(stockOrderFilterRequest.getLocStorageCode()); -// FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest(); -// filterInvUserRequest.setCode(invWarehouseEntity.getCode()); -// filterInvUserRequest.setUserid(userId.longValue()); -// filterInvUserRequest.setIsDirector(true); -// List warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest); -// if (CollUtil.isEmpty(warehouseUserEntities)) { -// stockOrderFilterRequest.setUnionUser(userId); -// } -// } else { -// return ResultVOUtils.error(500, "请先选择当前仓库"); -// } } else { CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(customerId)); stockOrderFilterRequest.setUnitIdFk(companyEntity.getUnitIdFk()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/ErpOrderEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/ErpOrderEntity.java index b53f748..fc7356f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/ErpOrderEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/ErpOrderEntity.java @@ -69,6 +69,10 @@ public class ErpOrderEntity { private BigDecimal price; private boolean checkSuccess; + private String locStorageCode; + private String invWarehouseCode;//当前分库 + private String fromSubInvCode; //往来分库 + public Integer getBindStatus() { if (bindStatus == null) return 0; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BasicEntrustRecRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BasicEntrustRecRequest.java index c5f8403..16098c8 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BasicEntrustRecRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BasicEntrustRecRequest.java @@ -16,5 +16,7 @@ public class BasicEntrustRecRequest extends ListPageRequest { private Date updateTime; private String curInv; private String lastUpdateTime; + private String entrustSubInv; + private String invWarehouseCode; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/inout/ErpOrderResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/inout/ErpOrderResponse.java index 6c20bb7..b8e9929 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/inout/ErpOrderResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/inout/ErpOrderResponse.java @@ -17,6 +17,9 @@ public class ErpOrderResponse { private String customerId; private String originType; private String locStorageCode; + private String invWarehouseCode;//当前分库 + private String fromSubInvCode; //往来分库 + private String thirdSysFk; private List subErpOrders; @@ -233,6 +236,22 @@ public class ErpOrderResponse { this.thirdSysFk = thirdSysFk; } + public String getInvWarehouseCode() { + return invWarehouseCode; + } + + public void setInvWarehouseCode(String invWarehouseCode) { + this.invWarehouseCode = invWarehouseCode; + } + + public String getFromSubInvCode() { + return fromSubInvCode; + } + + public void setFromSubInvCode(String fromSubInvCode) { + this.fromSubInvCode = fromSubInvCode; + } + public static class SubErpOrder { private String productId; private String productName; diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml index 04a6578..475fa34 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml @@ -25,6 +25,12 @@ and curInv = #{curInv} + + and entrustSubInv = #{entrustSubInv} + + + and invWarehouseCode = #{invWarehouseCode} + = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]>