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] =?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