From 461cea3055bf9f00ab4dd0be876f419b044648af Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Wed, 31 Aug 2022 09:40:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E7=94=A8=E5=8D=95=E6=8D=AE=E7=9B=B8?= =?UTF-8?q?=E5=85=B3bug=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/OrderDetailController.java | 14 ++-- .../controller/thrsys/ThrOrderController.java | 21 +++++- .../entity/thrsys/ThrOrderDetailEntity.java | 25 +++++++ .../admin/entity/thrsys/ThrOrderEntity.java | 2 + .../admin/res/inout/ErpOrderResponse.java | 19 +++++- .../admin/service/receipt/SyncUdiService.java | 2 +- .../receipt/impl/ProductInfoServiceImpl.java | 3 + .../thrsys/impl/ThrOrderServiceImpl.java | 4 ++ .../main/resources/application-dev.properties | 8 +-- .../mybatis/mapper/thrsys/ThrOrderDao.xml | 31 ++++----- .../mapper/thrsys/ThrOrderDetailDao.xml | 66 +++++++++++++------ 11 files changed, 142 insertions(+), 53 deletions(-) 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 9e4ece3..f03b7df 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 @@ -37,8 +37,7 @@ import com.glxp.sale.admin.service.thrsys.ThrOrderService; import com.glxp.sale.admin.thread.InvDlErpStockService; import com.glxp.sale.admin.thread.InvProductsTrService; import com.glxp.sale.admin.thread.IoTransInoutService; -import com.glxp.sale.admin.util.CustomUtil; -import com.glxp.sale.admin.util.DateUtil; +import com.glxp.sale.admin.util.*; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; @@ -80,6 +79,8 @@ public class OrderDetailController { @Resource private ThrOrderService thrOrderService; @Resource + GennerOrderUtils gennerOrderUtils; + @Resource private ThrOrderDetailService thrOrderDetailService; @Resource @@ -232,7 +233,7 @@ public class OrderDetailController { StockOrderEntity stockOrderEntity = new StockOrderEntity(); BeanUtils.copyProperties(thrOrderEntity, stockOrderEntity); - String billNo = CustomUtil.getId(); + String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.BUS_ORDER, "yyyyMMdd")); stockOrderEntity.setBillNo(billNo); BussinessOriginTypeResponse bussinessOriginTypeResponse = bussinessOriginTypeService.finByThirdAction(thrOrderEntity.getBillType()); stockOrderEntity.setBillType(bussinessOriginTypeResponse.getLocalAction()); @@ -241,6 +242,7 @@ public class OrderDetailController { stockOrderEntity.setUnitIdFk(customerId); stockOrderEntity.setStatus(ConstantStatus.SORDER_ALLOC);//未提交 stockOrderEntity.setLocStorageCode(filterErpOrderRequest.getLocStorageCode()); + stockOrderEntity.setInvWarehouseCode(filterErpOrderRequest.getInvWarehouseCode()); stockOrderEntity.setThirdOrderFk(thrOrderEntity.getBillNo()); stockOrderEntity.setSourceType(ConstantStatus.ST_THIRD_SEL);//外部提交 stockOrderEntity.setPrintStatus(ConstantStatus.SORDER_PRINT_UN);//未打印 @@ -255,11 +257,6 @@ public class OrderDetailController { List stockOrderDetailEntityList = new ArrayList<>(); for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity(); -// UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(thrOrderDetailEntity.getProductId(), thrOrderDetailEntity.getThirdSysFk()); -// -// if (udiRelevanceEntity == null) { -// return ResultVOUtils.error(500, "单据里含有未维护的产品信息，选入失败！"); -// } BeanUtils.copyProperties(thrOrderDetailEntity, stockOrderDetailEntity); stockOrderDetailEntity.setProductId(thrOrderDetailEntity.getProductId()); stockOrderDetailEntity.setCount(thrOrderDetailEntity.getCount() + ""); @@ -361,7 +358,6 @@ public class OrderDetailController { List erpOrderEntities = orderDetailService.filterMyErpOrder(filterErpOrderRequest); - OrderEntity orderEntity = orderService.findById(filterErpOrderRequest.getOrderId()); if (orderEntity == null) { return ResultVOUtils.error(500, "单据不存在！"); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderController.java index 8d8b2df..8e5a3a5 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderController.java @@ -173,6 +173,21 @@ public class ThrOrderController { } + + @AuthRuleAnnotation("") + @PostMapping("/udiwms/thrsys/delOrderDetail") + public BaseResponse delOrderDetail(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + boolean b = thrOrderDetailService.deleteById(deleteRequest.getId()); + if (b) + return ResultVOUtils.success("删除成功"); + else return ResultVOUtils.error(500, "无法删除！"); + + } + public String selectDelect(ThrOrderEntity thrOrderEntity) { FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest(); filterErpOrderRequest.setErpOrderId(thrOrderEntity.getBillNo()); @@ -215,7 +230,7 @@ public class ThrOrderController { if (filterThrProductsRequest.getErpOrderResponses() != null) {//选中导出 thrOrdersDlService.importSelectOrders(genKey, filterThrProductsRequest.getErpOrderResponses(), filterThrProductsRequest.getThirdSysFk()); } else { //结果导出 - thrOrdersDlService.importOrders(genKey, filterThrProductsRequest.getBillAction(),null); + thrOrdersDlService.importOrders(genKey, filterThrProductsRequest.getBillAction(), null); } return ResultVOUtils.success("后台开始下载更新，请稍后刷新查看"); } @@ -241,10 +256,10 @@ public class ThrOrderController { thrOrderImportLogEntity.setUpdateTime(new Date()); thrOrderImportLogEntity.setThirdSysFk(filterThrProductsRequest.getThirdSysFk()); thrOrderImportLogService.insertImportLog(thrOrderImportLogEntity); - if (filterThrProductsRequest.getErpOrderResponses() != null && filterThrProductsRequest.getErpOrderResponses().size()>0) {//选中导出 + if (filterThrProductsRequest.getErpOrderResponses() != null && filterThrProductsRequest.getErpOrderResponses().size() > 0) {//选中导出 thrOrdersDlService.importSelectOrders(genKey, filterThrProductsRequest.getErpOrderResponses(), filterThrProductsRequest.getThirdSysFk()); } else { //结果导出 - thrOrdersDlService.importOrders(genKey, filterThrProductsRequest.getBillAction(),filterThrProductsRequest); + thrOrdersDlService.importOrders(genKey, filterThrProductsRequest.getBillAction(), filterThrProductsRequest); } return ResultVOUtils.success("后台开始下载更新，请稍后刷新查看"); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrOrderDetailEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrOrderDetailEntity.java index 2bcea92..39ab90c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrOrderDetailEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrOrderDetailEntity.java @@ -25,4 +25,29 @@ public class ThrOrderDetailEntity { private BigDecimal price; //单价 private String corpName; //往来单位 + + private String sweepCount; + private String ylqxzcrbarmc; + private String zczbhhzbapzbh; + + //销售清单号（第二票） + private String secSalesListNo; + + //销售发票号（第一票） + private String firstSalesInvNo; + + //销售发票号（第二票） + private String secSalesInvNo; + + //开票日期 + private String invoiceDate; + private String manufactory; + private boolean allowNoBatch; + private boolean allowNoExpire; + private boolean allowNoProduct; + private String code; + private String serialNo; + + private Integer codeId; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrOrderEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrOrderEntity.java index 9f60187..785a523 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrOrderEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrOrderEntity.java @@ -13,6 +13,7 @@ public class ThrOrderEntity { private String corpId; private String corpName; private String billType; + private String billTypeName; private String billFlag; private String thirdSysFk; private Date updateTime; @@ -34,5 +35,6 @@ public class ThrOrderEntity { private String remark3; //备注3 private String locStorageCode; + private String invWarehouseCode; private Integer editStatus; } 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 b8e9929..30c5766 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 @@ -35,6 +35,7 @@ public class ErpOrderResponse { private String remark1; //备注1 private String remark2; //备注2 private String remark3; //备注3 + private String billTypeName; public String getStartDate() { return startDate; @@ -252,6 +253,14 @@ public class ErpOrderResponse { this.fromSubInvCode = fromSubInvCode; } + public String getBillTypeName() { + return billTypeName; + } + + public void setBillTypeName(String billTypeName) { + this.billTypeName = billTypeName; + } + public static class SubErpOrder { private String productId; private String productName; @@ -264,7 +273,7 @@ public class ErpOrderResponse { private String sweepCount; private String ylqxzcrbarmc; private String zczbhhzbapzbh; - + private String manufactory; private String detailId; //明细ID private String corpName; //往来单位 private BigDecimal price; //单价 @@ -389,6 +398,14 @@ public class ErpOrderResponse { public void setZczbhhzbapzbh(String zczbhhzbapzbh) { this.zczbhhzbapzbh = zczbhhzbapzbh; } + + public String getManufactory() { + return manufactory; + } + + public void setManufactory(String manufactory) { + this.manufactory = manufactory; + } } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/receipt/SyncUdiService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/receipt/SyncUdiService.java index 9f46172..f5552f8 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/receipt/SyncUdiService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/receipt/SyncUdiService.java @@ -86,7 +86,7 @@ public class SyncUdiService { return ResultVOUtils.error(500, "请输入完整的产品通用名称！"); } productInfoFilterRequest.setIsNewest(1); - productInfoFilterRequest.setDiType("1"); +// productInfoFilterRequest.setDiType("1"); String keyCache = productInfoFilterRequest.toCacheKey(); if (StrUtil.isEmpty(keyCache)) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/receipt/impl/ProductInfoServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/receipt/impl/ProductInfoServiceImpl.java index 75f8cdd..f235060 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/receipt/impl/ProductInfoServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/receipt/impl/ProductInfoServiceImpl.java @@ -106,6 +106,9 @@ public class ProductInfoServiceImpl implements ProductInfoService { } if (productInfoFilterRequest.getPage() != null) { int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit(); + if (offset < 0) { + offset = 0; + } productInfoFilterRequest.setPage(offset); productInfoFilterRequest.setLimit(productInfoFilterRequest.getLimit()); } else { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrOrderServiceImpl.java index 4f25784..ac7223c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrOrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrOrderServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.sale.admin.service.thrsys.impl; +import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; import com.glxp.sale.admin.dao.thrsys.ThrOrderDao; import com.glxp.sale.admin.dao.thrsys.ThrOrderDetailDao; @@ -95,6 +96,9 @@ public class ThrOrderServiceImpl implements ThrOrderService { @Override public ThrOrderEntity findByUnique(String billNo, String thirdSysFk) { + if (StrUtil.isEmpty(billNo) || StrUtil.isEmpty(thirdSysFk)) { + return null; + } FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); filterThrOrderRequest.setBillNo(billNo); filterThrOrderRequest.setThirdSysFk(thirdSysFk); diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties index 5a59e6c..eff4fd0 100644 --- a/api-admin/src/main/resources/application-dev.properties +++ b/api-admin/src/main/resources/application-dev.properties @@ -1,10 +1,10 @@ # \u751F\u4EA7\u73AF\u5883 server.port=9906 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_ph2?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_za?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.username=root +#spring.datasource.password=root spring.datasource.password=123456 -#spring.datasource.password=123456 spring.datasource.hikari.connection-timeout=60000 spring.datasource.hikari.maximum-pool-size=60 spring.datasource.hikari.minimum-idle=10 @@ -22,8 +22,8 @@ server.connectionTimeout=180000 #file_path=/home/glxpdata/udiwms file_path=D:/glxpdata/udiwms UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df -#UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test -UDI_SERVER_URL=http://127.0.0.1:9994 +UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test +#UDI_SERVER_URL=http://127.0.0.1:9994 #UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server spring.jackson.date-format=yyyy-MM-dd HH:mm:ss spring.jackson.time-zone=GMT+8 diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml index e1c7fc7..b788570 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml @@ -5,13 +5,14 @@ @@ -57,7 +55,7 @@ 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) + remark3,locStorageCode,editStatus,invWarehouseCode) values ( #{id}, #{billNo}, @@ -82,7 +80,8 @@ #{remark2}, #{remark3}, #{locStorageCode}, - #{editStatus} + #{editStatus}, + #{invWarehouseCode} ) @@ -90,7 +89,7 @@ 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) + remark3,locStorageCode,editStatus,invWarehouseCode) values @@ -145,7 +145,7 @@ remark3=#{remark3}, locStorageCode=#{locStorageCode}, editStatus=#{editStatus}, - + invWarehouseCode=#{invWarehouseCode}, WHERE id = #{id} @@ -155,7 +155,7 @@ INTO thr_order (id,billNo, billdate, corpId, corpName, billType, billFlag, thirdSysFk, updateTime, originType, startDate, endDate, createUser, reviewUser, address, linkMan, linkTel, remark, remark1, remark2, - remark3) + remark3,invWarehouseCode) values ( #{id}, #{billNo}, @@ -177,7 +177,8 @@ #{remark}, #{remark1}, #{remark2}, - #{remark3} + #{remark3}, + #{invWarehouseCode} ) \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml index fee69f9..1aca37b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml @@ -19,27 +19,43 @@ - replace INTO thr_order_detail + replace + INTO thr_order_detail (productId, productName, spec, batchNo, expireDate, - productDate, count, reCount, orderIdFk, thirdSysFk, updateTime, price, corpName) - values (#{productId}, #{productName}, #{spec}, #{batchNo}, #{expireDate}, - #{productDate}, #{count}, #{reCount}, #{orderIdFk}, #{thirdSysFk}, #{updateTime}, - #{price}, #{corpName}) + productDate, `count`, reCount, orderIdFk, thirdSysFk, updateTime, price, corpName,ylqxzcrbarmc,zczbhhzbapzbh,manufactory) + values ( + #{productId}, + #{productName}, + #{spec}, + #{batchNo}, + #{expireDate}, + #{productDate}, + #{count}, + #{reCount}, + #{orderIdFk}, + #{thirdSysFk}, + #{updateTime}, + #{price}, + #{corpName}, + #{ylqxzcrbarmc}, + #{zczbhhzbapzbh}, + #{manufactory} + ) replace INTO thr_order_detail - (productId, productName, spec, batchNo, expireDate, - productDate, count, reCount, orderIdFk, thirdSysFk, updateTime - , price, corpName) - values + (productId, productName, spec, batchNo, expireDate, + productDate, `count`, reCount, orderIdFk, thirdSysFk, updateTime + , price, corpName,ylqxzcrbarmc,zczbhhzbapzbh,manufactory) + values (#{item.productId}, #{item.productName}, #{item.spec}, #{item.batchNo}, #{item.expireDate}, - #{item.productDate}, #{item.count}, #{item.reCount}, #{item.orderIdFk}, #{item.thirdSysFk}, - #{item.updateTime}, - #{item.price}, #{item.corpName}) + #{item.productDate}, #{item.count}, #{item.reCount}, #{item.orderIdFk}, #{item.thirdSysFk}, + #{item.updateTime}, + #{item.price}, #{item.corpName}, #{item.ylqxzcrbarmc}, #{item.zczbhhzbapzbh}, #{item.manufactory}) @@ -48,7 +64,7 @@ replace INTO thr_order_detail (id,productId, productName, spec, batchNo, expireDate, - productDate, `count`, reCount, orderIdFk, thirdSysFk, updateTime, price, corpName) + productDate, `count`, reCount, orderIdFk, thirdSysFk, updateTime, price, corpName,ylqxzcrbarmc,zczbhhzbapzbh,manufactory) values ( #{id}, #{productId}, @@ -63,15 +79,22 @@ #{thirdSysFk}, #{updateTime}, #{price}, - #{corpName} + #{corpName}, + #{ylqxzcrbarmc}, + #{zczbhhzbapzbh}, + #{manufactory} ) - DELETE FROM thr_order_detail WHERE id = #{id} + DELETE + FROM thr_order_detail + WHERE id = #{id} - DELETE FROM thr_order_detail WHERE orderIdFk = #{orderIdFk} + DELETE + FROM thr_order_detail + WHERE orderIdFk = #{orderIdFk} @@ -89,16 +112,19 @@ thirdSysFk=#{thirdSysFk}, updateTime=#{updateTime}, price=#{price}, - corpName=#{corpName}, + corpName=#{corpName}, + + ylqxzcrbarmc=#{ylqxzcrbarmc}, + zczbhhzbapzbh=#{zczbhhzbapzbh}, + manufactory=#{manufactory}, WHERE id = #{id} - - - DELETE FROM thr_order_detail + DELETE + FROM thr_order_detail \ No newline at end of file