From b6e129e993c3feb002eda278393e41b4aa2eddf8 Mon Sep 17 00:00:00 2001 From: kilo Date: Mon, 16 Oct 2023 11:11:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?distribution=E5=90=AF=E5=8A=A8=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/distribution/feign/IDistributionStockListClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockListClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockListClient.java index aff5c436b..c261acfd2 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockListClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockListClient.java @@ -112,7 +112,7 @@ public interface IDistributionStockListClient { @GetMapping(API_PREFIX+"/getListByMarketIdAndMaterialName") List getListByMarketIdAndMaterialName(@RequestParam("marketId") Long marketId, @RequestParam("materialName") String materialName, @RequestParam("warehouseId") Long warehouseId); - @GetMapping(API_PREFIX+"/getListByMarketIdAndMaterialName") + @GetMapping(API_PREFIX+"/getStockListByWarehouseIdAndMarketAndStockListInfo") List getStockListByWarehouseIdAndMarketAndStockListInfo(@RequestParam("incomingBatch") String incomingBatch,@RequestParam("marketNames") List marketNames,@RequestParam("warehouseId") Long warehouseId); From 06450d2dff6d46f3f684486b96d9ba3488717175 Mon Sep 17 00:00:00 2001 From: kilo Date: Mon, 16 Oct 2023 11:21:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B4=A7=E6=9E=B6=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E8=B4=A7=E4=BD=8D=E7=BB=B4=E6=8A=A4qrcode=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BasicdataGoodsShelfServiceImpl.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java index fc7de565c..ec33fb0bd 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java @@ -93,6 +93,8 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl>>>>>>>>>{}", rowNum); Integer storeyNum = basicdataGoodsShelfDTO.getStoreyNum();//行 log.info("行>>>>>>>>>>{}", storeyNum); @@ -349,6 +351,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl arrayList = new ArrayList<>(); for (Integer i = 0; i < rowNum; i++) { @@ -366,6 +369,9 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl Date: Mon, 16 Oct 2023 11:55:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.=E5=BA=93=E4=BD=8D=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BasicdataDriverArteryController.java | 12 ++++++------ .../service/impl/BasicdataCodeServiceImpl.java | 1 + .../com/logpm/warehouse/mapper/TaskQuestMapper.xml | 6 +++--- .../warehouse/service/impl/TaskQuestServiceImpl.java | 3 ++- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java index c77079d52..2352d532d 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java @@ -44,7 +44,7 @@ import org.springblade.core.tool.utils.Func; import org.springblade.system.entity.User; import org.springblade.system.feign.IUserClient; import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.handler.UserRoleAuthorizationInterceptor; + import springfox.documentation.annotations.ApiIgnore; import javax.servlet.http.HttpServletResponse; @@ -130,11 +130,11 @@ public class BasicdataDriverArteryController extends BladeController { } String phone = basicdataDriverArtery.getPhone(); - R userR = userClient.userInfoByPhone(AuthUtil.getUser().getTenantId(), phone); - if (Func.isNotEmpty(userR.getData())){ - User user = userR.getData(); - basicdataDriverArtery.setUserId(user.getId()); - } +// R userR = userClient.userInfoByPhone(AuthUtil.getUser().getTenantId(), phone); +// if (Func.isNotEmpty(userR.getData())){ +// User user = userR.getData(); +// basicdataDriverArtery.setUserId(user.getId()); +// } boolean save = basicdataDriverArteryService.save(basicdataDriverArtery); //加入关联表 if (null !=basicdataDriverArtery.getBindVehicles()&& save){ diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java index c961c2fde..1414f6784 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java @@ -124,6 +124,7 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService { Long incr = bladeRedis.incr(key); //托盘码查重 BasicdataTrayEntity basicdataTrayEntity = basicdataTrayMapper.selectOne(new QueryWrapper().lambda() + .eq(BasicdataTrayEntity::getIsDeleted,0) .like(BasicdataTrayEntity::getPalletCode,HTCD) .orderByDesc(BasicdataTrayEntity::getCreateTime) .last("limit 1")); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml index 3fc6ca2c1..ca82dc181 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml @@ -69,17 +69,17 @@ FROM logpm_quest_detail lqd - lqd.quest_type =2 and lqd.is_deleted =0 and (lqd.quest_status = 0 or lqd.quest_status = 1) + lqd.quest_type =2 and lqd.is_deleted =0 and (lqd.quest_status = 0 or lqd.quest_status = 1) and lqd.quest_id = #{param.questId} and lqd.warehouse_id in #{item} - + and lqd.position_code like concat('%',#{param.code},'%') - + and lqd.allocation_id = #{param.code} diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java index c81bf0153..69cbb1016 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java @@ -191,7 +191,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl selectTaskQuestApiPage(IPage page, TaskQuestApiVO taskQuest) { - +// baseMapper.setSqlMode(); List collect = this.getmyWarehouseList(); List taskQuestVOS = baseMapper.selectTaskQuestApiPage(page, taskQuest, collect); for (TaskQuestApiVO taskQuestVO : taskQuestVOS) { @@ -213,6 +213,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl selectallocationList(IPage page, TaskSearchDTO taskSearchDTO) { List collect = this.getmyWarehouseList(); + baseMapper.setSqlMode(); List list = baseMapper.selectallocationList(page, taskSearchDTO, collect); if (!list.isEmpty()) { for (TaskallocationVO taskallocationVO : list) {