From 142fc1dfeac02963823a50c6d2b2a3b07957f16a Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 28 Jun 2024 10:31:23 +0800 Subject: [PATCH 1/5] =?UTF-8?q?rev:=20=E4=BA=8C=E6=9C=9F=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ios/service/iostorInv/util/service/OutBussManageService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/OutBussManageService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/OutBussManageService.java index f10b982c5..a58056bce 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/OutBussManageService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/OutBussManageService.java @@ -50,6 +50,7 @@ public interface OutBussManageService { * @return List: 分配明细集合 */ List manualDivIvt(StIvtIostorinvdtl dtlDao, List ivtList); + /** * 更新库存 From b9cf783ccdb0b2e8b7f3cbb6f37c8431809513d9 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Fri, 28 Jun 2024 13:58:52 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=2097=E4=BF=A1=E5=8F=B7=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../b_lms/sch/tasks/slitter/service/SlitterService.java | 7 +++++++ .../tasks/slitter/service/impl/SlitterServiceImpl.java | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java index 8626759dc..a662e75e1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java @@ -147,4 +147,11 @@ public interface SlitterService { * @return / */ JSONObject toCleanCutCacheInventory(JSONObject param); + + /** + * 分切拼接操作 + * @param param / + * @return / + */ + JSONObject slitterSpliceOperation(JSONObject param); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java index f77c8121b..517d34fa2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java @@ -139,7 +139,7 @@ public class SlitterServiceImpl implements SlitterService { // point.getTube_code1() 编码 ， getTube_name1() ： 纸制筒管|纸管|6英寸|1300 or 纸制筒管|纸管|3英寸|12|650 res.put("device_code", deviceCode); res.put("data", con); - if ("1".equals(autoSendEmpty.getValue())) { + if ("1".equals(autoSendEmpty.getValue()) && list.size() == 0) { con.put("is_bushing", "2"); } else { con.put("is_bushing", list.size() > 0 ? SlitterConstant.SLITTER_YES : SlitterConstant.SLITTER_NO); @@ -973,4 +973,10 @@ public class SlitterServiceImpl implements SlitterService { res.put("message", "库存清除成功!"); return res; } + + @Override + public JSONObject slitterSpliceOperation(JSONObject param) { + // todo: + return null; + } } From a7bd40dcbdde1048c0b1109107b248fae08e4c8c Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Fri, 28 Jun 2024 14:44:17 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E5=A4=87=E8=B4=A7=E5=8C=BA=E5=8F=8D?= =?UTF-8?q?=E9=A6=88acs=E7=BA=B8=E7=AE=A1=E4=BF=A1=E6=81=AF=E6=94=B9?= =?UTF-8?q?=E4=B8=BAstring?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sch/tasks/slitter/util/SlitterTaskUtil.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java index cf924a6fb..9842b51b5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java @@ -3,15 +3,13 @@ package org.nl.b_lms.sch.tasks.slitter.util; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.nl.b_lms.bst.ivt.papervehicle.service.dao.MdPbPapervehicle; -import org.nl.b_lms.bst.ivt.stockingivt.service.dao.BstIvtStockingivt; import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan; import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant; import org.nl.modules.common.exception.BadRequestException; +import java.util.Arrays; import java.util.List; -import java.util.StringJoiner; /** * @Author: lyd @@ -236,9 +234,13 @@ public class SlitterTaskUtil { qtys[i] = qty; } } - param.put("to_material", material_codes); - param.put("to_spec", material_codes); - param.put("to_qty", qtys); + // 转成String + String[] qtysStr = Arrays.stream(qtys) + .mapToObj(String::valueOf) + .toArray(String[]::new); + param.put("to_material", String.join(",", material_codes)); + param.put("to_spec", String.join(",", material_codes)); + param.put("to_qty", String.join(",", qtysStr)); param.put("device_code", material_specs); } } From e17eed36cada4d95344624cc9523ebc2b7fa6770 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Fri, 28 Jun 2024 14:49:30 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E6=89=8B=E6=8C=81=E7=82=B9=E4=BD=8D?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sch/tasks/slitter/service/impl/SlitterServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java index 517d34fa2..c89f361b0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java @@ -928,7 +928,7 @@ public class SlitterServiceImpl implements SlitterService { @Override public JSONArray getCutCacheAgvPoints() { - List list = bcutpointivtService.getPintByAgvCodesByPointType("3"); + List list = bcutpointivtService.getPintByAgvCodesByPointType("2"); JSONArray jsonArray = list.stream() .map(item -> { JSONObject jsonObject = new JSONObject(); From 66212b6ed4b074929fd1fd9200bc3bb2293cf5c9 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Fri, 28 Jun 2024 14:59:21 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E6=89=8B=E6=8C=81=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sch/tasks/slitter/service/impl/SlitterServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java index c89f361b0..4988af4c0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java @@ -932,8 +932,8 @@ public class SlitterServiceImpl implements SlitterService { JSONArray jsonArray = list.stream() .map(item -> { JSONObject jsonObject = new JSONObject(); - jsonObject.put("text", item.getPoint_code()); - jsonObject.put("value", item.getPoint_name()); + jsonObject.put("text", item.getPoint_name()); + jsonObject.put("value", item.getPoint_code()); return jsonObject; }) .collect(Collectors.toCollection(JSONArray::new));