From 5aefa9c246ddc68b31ffd461fa801b30a0db73c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 30 Nov 2022 18:03:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/basic/UdiRelevanceController.java | 4 ++++ .../glxp/sale/admin/dao/thrsys/ThrProductsAddDiDao.java | 1 + .../com/glxp/sale/admin/entity/basic/UdiInfoEntity.java | 6 +++--- .../sale/admin/req/basic/BusTypeChangeFilterRequest.java | 2 ++ .../glxp/sale/admin/req/basic/FilterUdiInfoRequest.java | 2 ++ .../com/glxp/sale/admin/req/purchase/PurApplyRequest.java | 2 ++ .../glxp/sale/admin/res/purchase/PurApplyResponse.java | 3 +++ .../service/thrsys/impl/ThrProductsAddDiServiceImpl.java | 8 +++++++- .../glxp/sale/admin/thread/CompanyProductsRelService.java | 2 ++ .../mybatis/mapper/basic/BussinessChangeTypeDao.xml | 6 ++++++ .../main/resources/mybatis/mapper/inout/StockOrderDao.xml | 3 ++- .../resources/mybatis/mapper/purchase/PurApplyDao.xml | 3 +++ .../mybatis/mapper/thrsys/ThrProductsAddDiDao.xml | 7 +++++++ 13 files changed, 44 insertions(+), 5 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java index 7fc66ed..7ce5976 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java @@ -312,8 +312,12 @@ public class UdiRelevanceController { udiInfoEntity.setMeasname(udiRelevanceResponse.getMeasname()); udiInfoEntity.setManufactory(udiRelevanceResponse.getManufactory()); udiInfoEntity.setCpms(udiRelevanceResponse.getCpms()); +// udiInfoEntity.setDiType(udiRelevanceResponse.getDiType()); 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/sale/admin/dao/thrsys/ThrProductsAddDiDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/thrsys/ThrProductsAddDiDao.java index 659d1a3..f34422e 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/thrsys/ThrProductsAddDiDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/thrsys/ThrProductsAddDiDao.java @@ -36,4 +36,5 @@ public interface ThrProductsAddDiDao { /** 根据ID查询 */ ThrProductsAddDiEntity filterThrProductsGetId(@Param("id") Integer id); + ThrProductsAddDiEntity filterThrProductsGetUuid(@Param("uuid") String uuid); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiInfoEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiInfoEntity.java index c1a35c7..9e1a1b9 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiInfoEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiInfoEntity.java @@ -30,7 +30,7 @@ public class UdiInfoEntity { private String sydycpbs; private String uuid; private int versionNumber; - private int diType; + private Integer diType; private String thirdId; private String thirdName; private String ybbm; @@ -308,11 +308,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/sale/admin/req/basic/BusTypeChangeFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BusTypeChangeFilterRequest.java index 59cd821..86e2f44 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BusTypeChangeFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BusTypeChangeFilterRequest.java @@ -8,4 +8,6 @@ public class BusTypeChangeFilterRequest extends ListPageRequest { private String action; private String originAction; + private String originName; + private String targetName; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterUdiInfoRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterUdiInfoRequest.java index 61f8901..c94111c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterUdiInfoRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterUdiInfoRequest.java @@ -60,4 +60,6 @@ public class FilterUdiInfoRequest extends ListPageRequest { private String originUuid; private String relId; + private String companyName; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/PurApplyRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/PurApplyRequest.java index beb86cd..f8e09d5 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/PurApplyRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/PurApplyRequest.java @@ -105,5 +105,7 @@ public class PurApplyRequest extends ListPageRequest { private boolean audtoPlan; + private Integer applyType; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/purchase/PurApplyResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/purchase/PurApplyResponse.java index 1a4ad29..4261ee8 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/purchase/PurApplyResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/purchase/PurApplyResponse.java @@ -3,6 +3,7 @@ package com.glxp.sale.admin.res.purchase; import lombok.Data; import java.util.Date; +import java.util.List; @Data public class PurApplyResponse { @@ -76,4 +77,6 @@ public class PurApplyResponse { private String planBillNo; //生成采购计划单据号 private boolean audtoPlan; + + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrProductsAddDiServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrProductsAddDiServiceImpl.java index 2ab25da..789f9b0 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrProductsAddDiServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrProductsAddDiServiceImpl.java @@ -95,7 +95,13 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService { @Override public UdiInfoEntity getDiProductDetail(String uuid) { - return thrProductsAddDiDao.getDiProductDetail(uuid); + ThrProductsAddDiEntity thrProductsAddDiEntity=thrProductsAddDiDao.filterThrProductsGetUuid(uuid); + UdiInfoEntity udiInfoEntity=thrProductsAddDiDao.getDiProductDetail(uuid); + udiInfoEntity.setSptm(thrProductsAddDiEntity.getSptm()); + udiInfoEntity.setYbbm(thrProductsAddDiEntity.getYbbm()); + udiInfoEntity.setManufactory(thrProductsAddDiEntity.getManufactory()); + udiInfoEntity.setCpms(thrProductsAddDiEntity.getCpms()); + return udiInfoEntity; } @Override diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/CompanyProductsRelService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/CompanyProductsRelService.java index 3b2f2a7..ee471b7 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/CompanyProductsRelService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/CompanyProductsRelService.java @@ -45,6 +45,8 @@ public class CompanyProductsRelService { BeanUtils.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiInfoEntity); BeanUtils.copyProperties(supplementRequest, udiRelevanceEntity); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); + udiInfoEntity.setDiType(null); + udiInfoEntity.setPackLevel(null); udiInfoService.updateUdiInfo(udiInfoEntity); companyProductRelevanceEntity.setCreate_time(new Date()); companyProductRelevanceEntity.setUpdate_time(new Date()); 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 48512f4..dc1927b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessChangeTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessChangeTypeDao.xml @@ -32,6 +32,12 @@ AND basic_bustype_pre.`action` = #{action} + + AND busTypeA.NAME LIKE CONCAT(#{originName},'%') + + + AND busTypeB.name LIKE CONCAT(#{targetName},'%') + AND basic_bustype_pre.`originAction` = #{originAction} 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 44677fa..eb5ff90 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml @@ -221,7 +221,8 @@ 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 f3241da..086c4a7 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 + diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml index 0f9b046..9793385 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml @@ -78,6 +78,13 @@ where id = #{id} + +