From ed9a263abf7dc8214da0e2d4d82d1f4efe970ce7 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Mon, 15 Aug 2022 14:04:09 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=8F=92=E5=85=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mybatis/mapper/inventory/InvPreProductDao.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDao.xml index ade6055..f5bbb38 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDao.xml @@ -84,10 +84,12 @@ AND supId is NULL - + AND batchNo = #{batchNo} - + + AND batchNo is NULL + AND batchNo is NULL From cefda56b75eaee05b3f37b08f76cd92ac1ec0382 Mon Sep 17 00:00:00 2001 From: x_z Date: Mon, 15 Aug 2022 16:43:42 +0800 Subject: [PATCH 2/8] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=A2=84=E9=AA=8C=E6=94=B6=E5=BA=93=E5=BA=93=E5=AD=98=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventory/impl/InvPreInProductDetailServiceImpl.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java index 28802c9..984f97a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java @@ -17,9 +17,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Collections; -import java.util.HashMap; import java.util.List; -import java.util.Map; @Service public class InvPreInProductDetailServiceImpl implements InvPreInProductDetailService { @@ -103,7 +101,7 @@ public class InvPreInProductDetailServiceImpl implements InvPreInProductDetailSe public InvProductDetailEntity statInvPreInDetail(String code) { FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest(); filterInvProductDetailRequest.setOriginCode(code); - + filterInvProductDetailRequest.setMainAction(ConstantType.TYPE_PUT); List datas = invPreInProductDetailDao.filterInvProductDetail(filterInvProductDetailRequest); if (CollUtil.isEmpty(datas)) { filterInvProductDetailRequest.setOriginCode(null); From 7a2c66b11096716472a8a9800402e73d8cbc9ddc Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Tue, 16 Aug 2022 10:50:59 +0800 Subject: [PATCH 3/8] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/utils/CheckOrderUtils.java | 21 ++++++----- .../entity/receipt/ProductInfoEntity.java | 12 ++++++- .../req/inout/StockOrderFilterRequest.java | 3 +- .../sale/admin/thread/AsyncCompanyDlTask.java | 2 +- .../mybatis/mapper/basic/ProductInfoDao.xml | 36 +++++++++++++++++-- .../mybatis/mapper/inout/StockOrderDao.xml | 12 ++++++- 6 files changed, 68 insertions(+), 18 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/CheckOrderUtils.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/CheckOrderUtils.java index f8632af..06810af 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/CheckOrderUtils.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/CheckOrderUtils.java @@ -54,7 +54,7 @@ public class CheckOrderUtils { filterUdiInfoRequest.setNameCode(myErpOrder.getNameCode()); UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(myErpOrder.getBindRlFk()); for (ErpOrderEntity vailOrderEntity : vailOrderEntities) { - if(!vailOrderEntity.isCheckSuccess()){ + if (!vailOrderEntity.isCheckSuccess()) { if (checkId(vailOrderEntity, udiRelevanceResponse, bussinessTypeEntity) == null && checkBatchNo(vailOrderEntity, myErpOrder) == null && checkProductDate(vailOrderEntity, myErpOrder) == null @@ -129,7 +129,7 @@ public class CheckOrderUtils { status = getStockOrderStatus(orderEntity, bussinessTypeEntity); stockOrderEntity.setStatus(status); stockOrderEntity.setOrderIdFk(orderId); - if(orderEntity.getCustomerId().equals("110")){ + if (orderEntity.getCustomerId().equals("110")) { stockOrderEntity.setReviewUser(orderEntity.getReviewUser()); } stockOrderService.updateById(stockOrderEntity); @@ -192,8 +192,7 @@ public class CheckOrderUtils { if (bussinessTypeEntity.isSecCheckBalacne()) { return ConstantStatus.SORDER_CHECKED; } - } - else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_UDIWMS) { + } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_UDIWMS) { if (bussinessTypeEntity.isSecCheckUdiwms()) { return ConstantStatus.SORDER_CHECKED; } @@ -254,15 +253,15 @@ public class CheckOrderUtils { if (vailOrderEntity.getGoodsid().equals(udiRelevanceResponse.getThirdId4() + "")) return null; } - return "产品ID不匹配！"; + return vailOrderEntity.getCoName() + "产品ID不匹配！"; } } else { - return "产品ID不匹配！"; + return vailOrderEntity.getCoName() + "产品ID不匹配！"; } - return "产品信息未找到！"; + return vailOrderEntity.getCoName() + "产品信息未找到！"; } public String checkBatchNo(ErpOrderEntity vailOrderEntity, ErpOrderEntity myErpOrder) { @@ -274,7 +273,7 @@ public class CheckOrderUtils { } else { return myErpOrder.getCoName() + "批次号不匹配！"; } - return "批次号不匹配！"; + return myErpOrder.getCoName() + "批次号不匹配！"; } public String checkProductDate(ErpOrderEntity vailOrderEntity, ErpOrderEntity myErpOrder) { @@ -286,7 +285,7 @@ public class CheckOrderUtils { } else { return myErpOrder.getCoName() + "生产日期不匹配！"; } - return "生产日期不匹配！"; + return myErpOrder.getCoName() + "生产日期不匹配！"; } @@ -299,7 +298,7 @@ public class CheckOrderUtils { } else { return myErpOrder.getCoName() + "失效日期不匹配！"; } - return "失效日期不匹配！"; + return myErpOrder.getCoName() + "失效日期不匹配！"; } @@ -312,7 +311,7 @@ public class CheckOrderUtils { } else { return myErpOrder.getCoName() + "仓位号不匹配！"; } - return "仓位号不匹配！"; + return myErpOrder.getCoName() + "仓位号不匹配！"; } public String checkCount(ErpOrderEntity vailOrderEntity, ErpOrderEntity myErpOrder) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/receipt/ProductInfoEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/receipt/ProductInfoEntity.java index 7e35d83..89dc38b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/receipt/ProductInfoEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/receipt/ProductInfoEntity.java @@ -52,10 +52,20 @@ public class ProductInfoEntity { private String expireDate; private Boolean isNewest; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; private String cplx; private String hchzsb; + private String sfwblztlcp; + private String cgzmraqxgxx; + private String sfbjwycxsy; + private String zdcfsycs; + private String sfwwjbz; + private String syqsfxyjxmj; + private String qtxxdwzlj; + private String mjfs; + + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderFilterRequest.java index c419e31..76b60c7 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderFilterRequest.java @@ -38,7 +38,8 @@ public class StockOrderFilterRequest extends ListPageRequest { private String entrustUser; private boolean entrustEnd; private String localAction; - + private String startDate; //起始日期 + private String endDate; //结束日期 private String orderId; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/AsyncCompanyDlTask.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/AsyncCompanyDlTask.java index 6644374..bd8fa67 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/AsyncCompanyDlTask.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/AsyncCompanyDlTask.java @@ -36,7 +36,7 @@ public class AsyncCompanyDlTask implements SchedulingConfigurer { ScheduledRequest scheduledRequest = new ScheduledRequest(); scheduledRequest.setCronName("syncCompany"); ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest); - String cron = scheduledEntity.getCron();//"0 55 5 * * ?"; + String cron = scheduledEntity.getCron(); if (cron.isEmpty()) { logger.error("cron is null"); } diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml index f6a000b..9c08699 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml @@ -360,6 +360,7 @@ cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber ,diType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq, ybbm,spmc,cphhhbh,cpms,cpbsbmtxmc,isNewest,updateTime,cplx,hchzsb +,sfwblztlcp,cgzmraqxgxx,sfbjwycxsy,zdcfsycs,sfwwjbz,syqsfxyjxmj,qtxxdwzlj,mjfs ) values ( @@ -403,7 +404,15 @@ #{updateTime}, #{hchzsb}, #{cplx}, - #{hchzsb} + #{hchzsb}, + #{sfwblztlcp}, + #{cgzmraqxgxx}, + #{sfbjwycxsy}, + #{zdcfsycs}, + #{sfwwjbz}, + #{syqsfxyjxmj}, + #{qtxxdwzlj}, + #{mjfs} ) @@ -417,6 +426,7 @@ cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber ,diType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq, ybbm,spmc,cphhhbh,cpms,cpbsbmtxmc,isNewest,updateTime,cplx,hchzsb + ,sfwblztlcp,cgzmraqxgxx,sfbjwycxsy,zdcfsycs,sfwwjbz,syqsfxyjxmj,qtxxdwzlj,mjfs ) values @@ -511,6 +522,15 @@ updateTime=#{updateTime}, cplx=#{cplx}, hchzsb=#{hchzsb}, + sfwblztlcp=#{sfwblztlcp}, + cgzmraqxgxx=#{cgzmraqxgxx}, + sfbjwycxsy=#{sfbjwycxsy}, + zdcfsycs=#{zdcfsycs}, + sfwwjbz=#{sfwwjbz}, + syqsfxyjxmj=#{syqsfxyjxmj}, + + qtxxdwzlj=#{qtxxdwzlj}, + mjfs=#{mjfs}, WHERE id = #{id} @@ -530,7 +550,17 @@ isNewest=#{isNewest}, updateTime=#{updateTime}, cplx=#{cplx}, - hchzsb=#{hchzsb}, + hchzsb=#{hchzsb}, + + sfwblztlcp=#{sfwblztlcp}, + cgzmraqxgxx=#{cgzmraqxgxx}, + sfbjwycxsy=#{sfbjwycxsy}, + zdcfsycs=#{zdcfsycs}, + sfwwjbz=#{sfwwjbz}, + syqsfxyjxmj=#{syqsfxyjxmj}, + + qtxxdwzlj=#{qtxxdwzlj}, + mjfs=#{mjfs}, WHERE uuid = #{uuid} diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml index 8756a04..025e897 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml @@ -193,6 +193,15 @@ + + + = DATE_FORMAT(#{startDate}, '%Y-%m-%d') ]]> + + + + + + and inv_warehouse_user.userId =#{userId} @@ -303,7 +312,8 @@ select io_codes.code udiCode,basic_udirel.id productId,basic_products.cpmctymc productName,basic_products.ggxh spec,io_codes.batchNo,io_codes.produceDate productDate,io_codes.expireDate ,io_codes.serialNo,io_codes.count, basic_products.ylqxzcrbarmc,basic_udirel.manufactory,basic_udirel.measname,basic_products.zczbhhzbapzbh, - inv_warehouse.name locInv, inv_warehouse_sub.name subInv, basic_products.spmc, basic_products.cpms,io_codes.nameCode,io_codes.relId + inv_warehouse.name locInv, inv_warehouse_sub.name subInv, basic_products.spmc, + basic_products.cpms,io_codes.nameCode,io_codes.relId from io_codes INNER JOIN basic_udirel on io_codes.relId = basic_udirel.id INNER JOIN basic_products on basic_products.uuid = basic_udirel.uuid From 9b5509450e5a738ed4bffc66651cbf2276feee0a Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Wed, 17 Aug 2022 10:20:30 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=B5=81=E5=90=91=E5=8A=A0=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B=E5=90=8D=E7=A7=B0=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=BA=A7=E5=93=81=E5=AE=A1=E6=A0=B8=E5=90=8E=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=B7=BB=E5=8A=A0=E5=88=B0=E8=80=97=E6=9D=90=E5=AD=97?= =?UTF-8?q?=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thrsys/ThrProductsAddController.java | 7 +++ .../admin/res/inout/UdiTraceResponse.java | 1 + .../service/basic/UdiContrastService.java | 59 +++++++++++++++++++ .../mybatis/mapper/inout/OrderDao.xml | 20 ++++--- 4 files changed, 79 insertions(+), 8 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java index fe841b7..6f27ab8 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java @@ -9,6 +9,7 @@ import com.glxp.sale.admin.req.info.DeleteRequest; import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.service.auth.CustomerService; +import com.glxp.sale.admin.service.basic.UdiContrastService; import com.glxp.sale.admin.service.thrsys.ThrProductsAddService; import com.glxp.sale.admin.service.thrsys.ThrProductsService; import com.glxp.sale.admin.util.BeanUtils; @@ -71,6 +72,10 @@ public class ThrProductsAddController { return ResultVOUtils.success("删除成功"); } + + @Resource + UdiContrastService udiContrastService; + @AuthRuleAnnotation("") @PostMapping("/udiwms/thrsys/updateThrAddProducts") public BaseResponse updateThrAddProducts(@RequestBody ThrProductsAddEntity thrProductsAddEntity, BindingResult bindingResult) { @@ -85,6 +90,8 @@ public class ThrProductsAddController { BeanUtils.copyProperties(thrProductsAddEntity, thrProductsEntity); thrProductsEntity.setUpdateTime(new Date()); thrProductsService.insertThrProducts(thrProductsEntity); + //审核通过后直接加到耗材字典里 + udiContrastService.createOnlyMainId(thrProductsAddEntity.getCode()); } else if (thrProductsAddEntity.getCheckStatus().equals(3)) { //不通过，删除第三方产品信息表中此产品数据 thrProductsService.delete(thrProductsAddEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/inout/UdiTraceResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/inout/UdiTraceResponse.java index 9f6f156..b84d051 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/inout/UdiTraceResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/inout/UdiTraceResponse.java @@ -9,6 +9,7 @@ public class UdiTraceResponse { private String actDate; private String mainAction; private String action; + private String actionName; private String fromCorp; private Integer count; private String cpmctymc; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiContrastService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiContrastService.java index a7955c9..dc832d3 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiContrastService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiContrastService.java @@ -2,9 +2,20 @@ package com.glxp.sale.admin.service.basic; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.dao.basic.UdiRelevanceDao; +import com.glxp.sale.admin.entity.basic.UdiInfoEntity; import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; +import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; +import com.glxp.sale.admin.req.basic.CombineRequest; import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest; +import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; +import com.glxp.sale.admin.service.thrsys.ThrProductsService; +import com.glxp.sale.admin.util.CustomUtil; +import com.glxp.sale.admin.util.DateUtil; +import com.glxp.sale.admin.util.GennerOrderUtils; +import com.glxp.sale.admin.util.UdiInfoUtil; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -94,5 +105,53 @@ public class UdiContrastService { return udiRelevanceEntities; } + @Resource + GennerOrderUtils gennerOrderUtils; + @Resource + ThrProductsService thrProductsService; + @Resource + UdiRelevanceService udiRelevanceService; + @Resource + UdiInfoService udiInfoService; + + public void createOnlyMainId(String mainId) { + FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); + filterThrProductsRequest.setCode(mainId); + List thrProductsEntities = thrProductsService.selectThrProducts(filterThrProductsRequest); + ThrProductsEntity thrProductsEntity = thrProductsEntities.get(0); + UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); + udiRelevanceEntity.setThirdId(thrProductsEntity.getCode()); + udiRelevanceEntity.setThirdName(thrProductsEntity.getName()); + udiRelevanceEntity.setMainId(thrProductsEntity.getCode()); + udiRelevanceEntity.setMainName(thrProductsEntity.getName()); + udiRelevanceEntity.setMeasname(thrProductsEntity.getMeasname()); + String time = DateUtil.getDateTime(); + udiRelevanceEntity.setUpdateTime(time); + udiRelevanceEntity.setModifyTime(time); + udiRelevanceEntity.setUuid(CustomUtil.getUUId()); + udiRelevanceEntity.setSupName(thrProductsEntity.getSupName()); + udiRelevanceEntity.setManufactory(thrProductsEntity.getManufactory()); + udiRelevanceEntity.setId(gennerOrderUtils.getRelId() + ""); + udiRelevanceEntity.setPrice(thrProductsEntity.getPrice()); + udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); + UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); + BeanUtils.copyProperties(thrProductsEntity, udiInfoEntity); + udiInfoEntity.setNameCode(thrProductsEntity.getCode()); + udiInfoEntity.setCpmctymc(thrProductsEntity.getName()); + udiInfoEntity.setManufactory(thrProductsEntity.getManufactory()); + udiInfoEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory()); + udiInfoEntity.setGgxh(thrProductsEntity.getSpec()); + udiInfoEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo()); + udiInfoEntity.setUuid(udiRelevanceEntity.getUuid()); + udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD); + udiInfoEntity.setDiType(1); + udiInfoEntity.setScbssfbhph("是"); + udiInfoEntity.setScbssfbhscrq("是"); + udiInfoEntity.setScbssfbhsxrq("是"); + udiInfoEntity.setScbssfbhxlh("否"); + udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity); + udiInfoService.insertUdiInfo(udiInfoEntity); + } + } 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 0e0366c..656bf26 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -34,7 +34,7 @@ receiveStatus, erpFk, stockCheckFk, customerId, supId, exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser, outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode, - fromSubInvCode, createTime,invStorageCode) + fromSubInvCode, createTime, invStorageCode) values (#{id}, #{action}, #{corpOrderId}, @@ -54,7 +54,7 @@ #{stockCheckFk}, #{customerId}, #{supId}, #{exportFilePath}, #{locStorageCode}, #{supplementNo}, #{ullageSupNo}, #{createUser}, #{reviewUser}, #{outChangeEnable}, #{originUllageSupNo}, #{preCheck}, - #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime},#{invStorageCode}) + #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime}, #{invStorageCode}) @@ -99,7 +99,8 @@ #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, - #{createTime},#{invStorageCode} + #{createTime}, + #{invStorageCode} ) @@ -191,7 +192,8 @@ SELECT io_order.* , - inv_warehouse.name as invName, - inv_warehouse_sub.name as subInvName - FROM io_order + inv_warehouse.name as invName, + inv_warehouse_sub.name as subInvName + FROM io_order LEFT JOIN inv_warehouse ON io_order.locStorageCode = inv_warehouse.`code` LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code` LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code` @@ -576,7 +578,9 @@ From 882dc7cc76f045be88172d0495f42a91f281e7b5 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Wed, 17 Aug 2022 14:13:35 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=B5=81=E5=90=91=E5=8A=A0=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B=E5=90=8D=E7=A7=B0=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=BA=A7=E5=93=81=E5=AE=A1=E6=A0=B8=E5=90=8E=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=B7=BB=E5=8A=A0=E5=88=B0=E8=80=97=E6=9D=90=E5=AD=97?= =?UTF-8?q?=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/thrsys/ThrProductsAddController.java | 10 +++++++++- .../sale/admin/entity/inout/StockOrderPrintEntity.java | 1 + .../glxp/sale/admin/res/inout/UdiTraceResponse.java | 1 + .../resources/mybatis/mapper/inout/StockOrderDao.xml | 3 ++- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java index 6f27ab8..0da8089 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java @@ -3,12 +3,14 @@ package com.glxp.sale.admin.controller.thrsys; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; +import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsAddEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; import com.glxp.sale.admin.req.info.DeleteRequest; import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.service.auth.CustomerService; +import com.glxp.sale.admin.service.basic.BasicThirdSysService; import com.glxp.sale.admin.service.basic.UdiContrastService; import com.glxp.sale.admin.service.thrsys.ThrProductsAddService; import com.glxp.sale.admin.service.thrsys.ThrProductsService; @@ -75,6 +77,8 @@ public class ThrProductsAddController { @Resource UdiContrastService udiContrastService; + @Resource + BasicThirdSysService basicThirdSysService; @AuthRuleAnnotation("") @PostMapping("/udiwms/thrsys/updateThrAddProducts") @@ -91,7 +95,11 @@ public class ThrProductsAddController { thrProductsEntity.setUpdateTime(new Date()); thrProductsService.insertThrProducts(thrProductsEntity); //审核通过后直接加到耗材字典里 - udiContrastService.createOnlyMainId(thrProductsAddEntity.getCode()); + BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); + if (basicThirdSysEntity.getThirdId().equals(thrProductsAddEntity.getThirdSysFk())) + if (!udiContrastService.isExit(null, thrProductsAddEntity.getCode(), null)) { + udiContrastService.createOnlyMainId(thrProductsAddEntity.getCode()); + } } else if (thrProductsAddEntity.getCheckStatus().equals(3)) { //不通过，删除第三方产品信息表中此产品数据 thrProductsService.delete(thrProductsAddEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java index 94af884..8fb6f30 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java @@ -52,4 +52,5 @@ public class StockOrderPrintEntity extends StockOrderDetailEntity { private String serialNo; //序列号 private String nameCode; + private String deptName; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/inout/UdiTraceResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/inout/UdiTraceResponse.java index b84d051..3a05b98 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/inout/UdiTraceResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/inout/UdiTraceResponse.java @@ -18,4 +18,5 @@ public class UdiTraceResponse { private String batchNo; private String produceDate; private String expireDate; + private String billTypeName; } diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml index 025e897..2dc2a75 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml @@ -277,7 +277,7 @@ stock_order_detail.expireDate, stock_order_detail.count, stock_order_detail.sweepCount, stock_order_detail.ylqxzcrbarmc,stock_order_detail.manufactory, stock_order_detail.zczbhhzbapzbh, stock_order_detail.price,inv_warehouse.name locInv,basic_products.spmc, - basic_products.cpms,basic_udirel.measname + basic_products.cpms,basic_udirel.measname,auth_dept.`name` deptName FROM stock_order INNER JOIN stock_order_detail on stock_order.id = stock_order_detail.orderIdFk LEFT JOIN inv_warehouse ON stock_order.locStorageCode = inv_warehouse.`code` @@ -285,6 +285,7 @@ LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code` left join basic_udirel on stock_order_detail.productId = basic_udirel.id left JOIN basic_products on basic_products.uuid = basic_udirel.uuid + left join auth_dept on stock_order.dept = auth_dept.`code` and stock_order.id =#{id} From 223afa6f82b9548ba993d71dd9d076763bee6014 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Wed, 17 Aug 2022 14:14:15 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/application-dev.properties | 26 +------------------ 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties index 47695ab..33403b4 100644 --- a/api-admin/src/main/resources/application-dev.properties +++ b/api-admin/src/main/resources/application-dev.properties @@ -1,7 +1,7 @@ # \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=123456 #spring.datasource.password=123456 @@ -10,7 +10,6 @@ spring.datasource.hikari.maximum-pool-size=60 spring.datasource.hikari.minimum-idle=10 #server.servlet.context-path= #logging.level.com.glxp.sale.admin.dao=debug -# \u8DE8\u57DF\u8BBE\u7F6E cors.allowed-origins=* cors.allowed-headers=Content-Type,ADMIN_ID,ADMIN_TOKEN cors.allowed-methods=GET,POST,PUT,DELETE,PATCH,OPTIONS @@ -32,39 +31,16 @@ logging.level.com.glxp.api.admin.dao.inventory=debug logging.level.com.glxp.api.admin.dao.thrsys=debug #file_path=/home/glxpdata/udiwms file_path=D:/glxpdata/udiwms -#UDI\u6570\u636E\u4E0B\u8F7D 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 -#UCLOD\u670D\u52A1 -#UCLOD_SERVER_URL=http://127.0.0.1:9997 -#UCLOD_SERVER_URL=http://127.0.0.1:8080/UDIC_UCLOUD_SERVER -UCLOD_SERVER_URL=http://139.9.178.73/UDIC_UCLOUD_SERVER -#mips\u670D\u52A1\u5730\u5740 -UDIC_MIPSDOWNLOAD_URL=http://127.0.0.1:8080/UDIC_MIPSDL_Server -#UDIC_MIPSDOWNLOAD_URL = http://127.0.0.1:9997 -UDIC_U8_URL="https://api.yonyoucloud.com/apis/u8c/uapbd/invmandoc_query" -#\u534F\u8C03\u5E73\u53F0\u5BA2\u6237\u7AEF\u5730\u5740 -COOR_UPLOAD_ORDER=http://127.0.0.1:9987/udi/upload -#\u5185\u5B58\u7801\u751F\u6210 -STOCK_PRINT_POST=http://139.159.187.130/UDI_WMS_MC/udiwms/stockprint/post spring.jackson.date-format=yyyy-MM-dd HH:mm:ss spring.jackson.time-zone=GMT+8 spring.main.allow-bean-definition-overriding=true -# Redis \u6570\u636E\u5E93\u7F16\u53F7 spring.redis.database=4 -# Redis \u670D\u52A1\u5668IP spring.redis.host=127.0.0.1 -# Redis \u7AEF\u53E3\u53F7 spring.redis.port=6379 -# Redis \u5BC6\u7801 spring.redis.password= -#\u6700\u5927\u6D3B\u8DC3\u8FDE\u63A5\u6570 spring.redis.jedis.pool.max-active=8 -#\u6700\u5927\u7B49\u5F85\u65F6\u95F4 spring.redis.jedis.pool.max-wait=-1 -#\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5\u6570 spring.redis.jedis.pool.max-idle=8 -#\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5\u6570 spring.redis.jedis.pool.min-idle=0 \ No newline at end of file From 776a425e5653fe4d1d25e9b56fa5d13336eed788 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Wed, 17 Aug 2022 16:21:13 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mybatis/mapper/inout/OrderDao.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 656bf26..ff2d06a 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -588,11 +588,12 @@