From 23a1787e7e490e724f0d6013dc7e7840f66d69df Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Sat, 22 Jun 2024 10:48:42 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix:=E5=8F=91=E8=B4=A7=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/b_lms/sch/tasks/TwoSendOutTask.java | 3 + .../util/impl/LashManageServiceImpl.java | 2 +- .../mes/service/impl/LmsToMesServiceImpl.java | 125 ++++++++++++++++-- 3 files changed, 120 insertions(+), 10 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoSendOutTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoSendOutTask.java index c3c68b775..a8a81e8fa 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoSendOutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoSendOutTask.java @@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; +import org.nl.common.enums.PackageInfoIvtEnum; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; @@ -57,6 +58,8 @@ public class TwoSendOutTask extends AbstractAcsTask { .vehicle_code(json.getString("vehicle_code")) .priority(json.getString("priority")) .class_type(json.getString("task_type")) + .agv_system_type("3") + .agv_action_type(PackageInfoIvtEnum.AGV_ACTION_TYPE.code("放货二次分配")) .dtl_type(String.valueOf(dtl_type)) .route_plan_code(getRoutePlanCode(json.getString("point_code1"))) .remark(json.getString("remark")) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java index d9d300604..58af8a8da 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java @@ -260,7 +260,7 @@ public class LashManageServiceImpl implements LashManageService { result.put("printQty", "1"); //第一次捆扎次数 - result.put("bundleTimes", "2"); + result.put("bundleTimes", "3"); return result; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java index 4317217a3..23fabe3cf 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java @@ -702,11 +702,24 @@ public class LmsToMesServiceImpl implements LmsToMesService { } @Override - public JSONObject momAutoTransterMoveIn(JSONObject param){ return null;} /*{ + public JSONObject momAutoTransterMoveIn(JSONObject param) { String from_area = param.getString("from_area"); String to_area = param.getString("to_area"); String container_name = param.getString("container_name"); + if (StrUtil.isEmpty(from_area)){ + throw new BadRequestException("起始区域不能为空！"); + } + + if (StrUtil.isEmpty(to_area)){ + throw new BadRequestException("目的区域不能为空！"); + } + + if (StrUtil.isEmpty(container_name)){ + throw new BadRequestException("子卷号不能为空！"); + } + + JSONObject result = new JSONObject(); log.info("momAutoTransterMoveIn接口输入参数为：-------------------" + param.toString()); @@ -718,13 +731,16 @@ public class LmsToMesServiceImpl implements LmsToMesService { String Password = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_PASSWORD").getValue(); param.put("UserName", UserName); param.put("Password", Password); + param.put("SourceLocation", from_area); + param.put("ContainerName", container_name); + param.put("DestLocation", to_area); try { String resultMsg = HttpRequest.post(url) .body(String.valueOf(param)) .execute().body(); result = JSONObject.parseObject(resultMsg); - log.info("LMSPackakge接口输出参数为：-------------------" + result.toString()); + log.info("momAutoTransterMoveIn接口输出参数为：-------------------" + result.toString()); String RTYPE = result.getString("RTYPE"); @@ -737,15 +753,106 @@ public class LmsToMesServiceImpl implements LmsToMesService { throw new BadRequestException("MES提示错误：" + e.getMessage()); } return result; - }*/ - - @Override - public JSONObject momGetPackingInfo(JSONObject jo) { - return null; } @Override - public JSONObject momBoxPackageSubmit(JSONObject jo) { - return null; + public JSONObject momGetPackingInfo(JSONObject param) { + String box_no = param.getString("box_no"); + + if (StrUtil.isEmpty(box_no)) { + throw new BadRequestException("木箱号不能为空！"); + } + + JSONObject result = new JSONObject(); + + log.info("momGetPackingInfo接口输入参数为：-------------------" + param.toString()); + + String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_URL").getValue(); + String api = "CamstarApi/momGetPackingInfo"; + url = url + api; + + String UserName = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_USERNAME").getValue(); + String Password = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_PASSWORD").getValue(); + param.put("UserName", UserName); + param.put("Password", Password); + param.put("ContainerName", box_no); + + try { + String resultMsg = HttpRequest.post(url) + .body(String.valueOf(param)) + .execute().body(); + result = JSONObject.parseObject(resultMsg); + log.info("momGetPackingInfo接口输出参数为：-------------------" + result.toString()); + + + String RTYPE = result.getString("RTYPE"); + if ("E".equals(RTYPE)) { + throw new BadRequestException(result.getString("RTMSG")); + } + + + } catch (Exception e) { + throw new BadRequestException("MES提示错误：" + e.getMessage()); + } + return result; + } + + @Override + public JSONObject momBoxPackageSubmit(JSONObject param) { + + log.info("momBoxPackageSubmit接口输入参数为：-------------------" + param.toString()); + + + String box_no = param.getString("box_no"); + String num = param.getString("num"); + String box_weight = param.getString("box_weight"); + JSONArray rows = param.getJSONArray("rows"); + + if(StrUtil.isEmpty(box_no)){ + throw new BadRequestException("木箱号不能为空！"); + } + + if(StrUtil.isEmpty(num)){ + throw new BadRequestException("箱内子卷数不能为空！"); + } + + if(StrUtil.isEmpty(box_weight)){ + throw new BadRequestException("木箱毛重不能为空！"); + } + + if(ObjectUtil.isEmpty(rows)){ + throw new BadRequestException("箱内子卷信息不能为空！"); + } + + JSONObject result = new JSONObject(); + + String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_URL").getValue(); + String api = "CamstarApi/momBoxPackageSubmit"; + url = url + api; + + String UserName = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_USERNAME").getValue(); + String Password = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_PASSWORD").getValue(); + param.put("UserName", UserName); + param.put("Password", Password); + param.put("ContainerName", box_no); + + try { + String resultMsg = HttpRequest.post(url) + .body(String.valueOf(param)) + .execute().body(); + result = JSONObject.parseObject(resultMsg); + log.info("momGetPackingInfo接口输出参数为：-------------------" + result.toString()); + + + String RTYPE = result.getString("RTYPE"); + if ("E".equals(RTYPE)) { + throw new BadRequestException(result.getString("RTMSG")); + } + + + } catch (Exception e) { + throw new BadRequestException("MES提示错误：" + e.getMessage()); + } + return result; } } From 74db7e79e0fe4e1fb719ab0a28ecc26c727c1ef3 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Sat, 22 Jun 2024 17:26:10 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=86=E5=88=87?= =?UTF-8?q?=E4=B8=8B=E6=96=99AGV=E4=BB=BB=E5=8A=A1=E6=B2=A1=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E7=A6=81=E7=94=A8=E7=82=B9=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/b_lms/sch/tasks/slitter/SlitterDownAgvTask.java | 4 ++++ .../nl/b_lms/sch/tasks/slitter/auto/AutoUpShaftTrussTask.java | 4 ++-- .../org/nl/b_lms/sch/tasks/slitter/constant/SlitterEnum.java | 2 +- .../org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml | 1 + .../sch/tasks/slitter/service/impl/SlitterServiceImpl.java | 2 ++ 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownAgvTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownAgvTask.java index b6b9015f5..0dde816da 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownAgvTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownAgvTask.java @@ -13,6 +13,7 @@ import org.nl.b_lms.sch.task.service.IschBaseTaskService; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.common.utils.SecurityUtils; import org.nl.common.utils.TaskUtils; +import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.sch.AcsTaskDto; @@ -76,6 +77,9 @@ public class SlitterDownAgvTask extends AbstractAcsTask { task.setTask_status(TaskStatusEnum.EXECUTING.getCode()); } if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) { + if (TaskStatusEnum.FINISHED.getCode().equals(task.getTask_status())) { + throw new BadRequestException("任务[" + task.getTask_code() + "]已经完成！"); + } task.setTask_status(TaskStatusEnum.FINISHED.getCode()); // 互换资源 String startPoint = task.getPoint_code1(); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoUpShaftTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoUpShaftTrussTask.java index 95e346bbd..6d3c220ea 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoUpShaftTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoUpShaftTrussTask.java @@ -97,9 +97,9 @@ public class AutoUpShaftTrussTask { if (ObjectUtil.isNotEmpty(nextUpPlan) && ObjectUtil.isNotEmpty(nextDownPlan)) { // 双轴任务参数构建 - param.put("point_code1", newCutPoint.getTruss_point_code2()); + param.put("point_code1", newCutPoint.getTruss_point_code1()); param.put("point_code2", device.getUp_point_code()); - param.put("point_code3", newCutPoint.getTruss_point_code1()); + param.put("point_code3", newCutPoint.getTruss_point_code2()); param.put("point_code4", device.getDown_point_code()); param.put("vehicle_code1", newCutPoint.getQzz_no1()); param.put("vehicle_code2", newCutPoint.getQzz_no2()); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterEnum.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterEnum.java index bb13f020f..626d53979 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterEnum.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterEnum.java @@ -21,7 +21,7 @@ public enum SlitterEnum { */ TASK_TYPE(MapOf.of("穿拔轴缓存<>穿拔轴位", "010801", "穿拔轴缓存<>分切对接位", "010802", "穿拔轴位<>气胀轴缓存位", "010803" , "分切机下料AGV任务", "010804", "分切机上气胀轴", "010805", "分切机下气胀轴", "010806", "备货区送载具", "010807" - , "备货区送纸管", "010808")); + , "备货区送纸管", "010808", "分切机下料桁架任务", "010809")); private Map code; public String code(String desc) { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml index e1c36a0fa..f2c289916 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml @@ -27,6 +27,7 @@ FROM `bst_ivt_cutpointivt` bct WHERE bct.point_type IN ('2', '3') AND bct.point_status = '3' + AND bct.is_used = '1' AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.task_status '07' 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 f1e8f4e6a..8b9841694 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 @@ -414,6 +414,7 @@ public class SlitterServiceImpl implements SlitterService { taskParam.put("truss_type", "1"); taskParam.put("empty_site", "0"); } + taskParam.put("task_type", SlitterEnum.TASK_TYPE.code("分切机下料桁架任务")); taskParam.put("product_area", SlitterConstant.SLITTER_TASK_AREA); // 分切计划修改状态 05 -> 06 currentPlans.forEach(plan -> { @@ -505,6 +506,7 @@ public class SlitterServiceImpl implements SlitterService { throw new BadRequestException("错误表达式"); } // 创建任务 + taskParam.put("task_type", SlitterEnum.TASK_TYPE.code("分切机下料桁架任务")); taskParam.put("product_area", SlitterConstant.SLITTER_TASK_AREA); slitterDownTrussTask.createTask(taskParam); // 下来的分切计划修改状态：05 -> 06 From c86ee18d3a0eaf664f5d38b862e70e12ccb74dc9 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Sun, 23 Jun 2024 14:50:50 +0800 Subject: [PATCH 3/6] =?UTF-8?q?feat:=20=E5=86=85=E5=8C=85=E9=97=B4?= =?UTF-8?q?=E4=B8=8D=E5=A5=97=E8=BD=B4=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tasks/slitter/service/impl/SlitterServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 8b9841694..426e320d2 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 @@ -117,9 +117,17 @@ public class SlitterServiceImpl implements SlitterService { throw new BadRequestException("设备：{ " + deviceCode + " }对应的气胀轴尺寸不批对" + "，需要气胀轴尺寸：{ " + point.getQzz_size() + " }，实际尺寸：{ " + size + " }"); } + List tubes = Stream.of(point.getTube_code1(), point.getTube_code2()) + .filter(ObjectUtil::isNotEmpty) + .collect(Collectors.toList()); + // 判断是否存在纸管 + List list = papervehicleService.list(new LambdaQueryWrapper() + .in(MdPbPapervehicle::getMaterial_code, tubes) + .gt(MdPbPapervehicle::getQty, 0)); // point.getTube_code1() 编码 ， getTube_name1() ： 纸制筒管|纸管|6英寸|1300 or 纸制筒管|纸管|3英寸|12|650 res.put("device_code", deviceCode); res.put("data", con); + con.put("is_bushing", list.size() > 0 ? SlitterConstant.SLITTER_YES : SlitterConstant.SLITTER_NO); con.put("left", point.getTube_code1()); con.put("leftSize", ObjectUtil.isNotEmpty(point.getTube_name1()) ? point.getTube_name1().split("\\|")[2].charAt(0) : ""); From 55cd804fa18fa7339c3a384104b25929d256842b Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Mon, 24 Jun 2024 15:29:49 +0800 Subject: [PATCH 4/6] =?UTF-8?q?fix:=20=E5=88=86=E5=88=87=E5=AF=B9=E6=8E=A5?= =?UTF-8?q?=E4=BD=8D=E5=8C=BA=E5=88=86=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slitter/auto/AutoSendAirShaftAgvTask.java | 6 +++- .../tasks/slitter/mapper/SlitterMapper.java | 5 ++-- .../tasks/slitter/mapper/SlitterMapper.xml | 1 + .../service/impl/SlitterServiceImpl.java | 11 ++++---- .../tasks/slitter/util/SlitterTaskUtil.java | 28 +++++++++++++++++++ 5 files changed, 43 insertions(+), 8 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java index f847dbaf3..d9ea066f0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java @@ -15,6 +15,7 @@ import org.nl.b_lms.sch.tasks.slitter.SendAirShaftAgvTask; import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant; import org.nl.b_lms.sch.tasks.slitter.constant.SlitterEnum; import org.nl.b_lms.sch.tasks.slitter.mapper.SlitterMapper; +import org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil; import org.nl.modules.common.exception.BadRequestException; import org.redisson.api.RLock; import org.redisson.api.RedissonClient; @@ -84,7 +85,10 @@ public class AutoSendAirShaftAgvTask { } // 如果两个气涨轴编码则表示一组满了 // 查找分切对接没任务的空位 - List emptyPoint = slitterMapper.getEmptyCutPointNotTask(area, deviceCut.getSort_seq()); + List emptyPoint = slitterMapper.getEmptyCutPointNotTask(area, + deviceCut.getSort_seq(), + SlitterTaskUtil.getPointLocationInCutDevice( + SlitterTaskUtil.getNumberByResourceCode(demoPlan.getResource_name()))); if (emptyPoint.size() == 0) { log.warn("找不到对应的位置！"); return; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.java index 7f9e2c266..21dce6d38 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.java @@ -37,9 +37,10 @@ public interface SlitterMapper { * 获取分切机下料位没任务的点位 * @param area 区域 * @param sortSeq 设备序号 - * @return + * @param location 区域 1-5：0 6-10：1 + * @return / */ - List getEmptyCutPointNotTask(String area, BigDecimal sortSeq); + List getEmptyCutPointNotTask(String area, BigDecimal sortSeq, String location); /** * 获取分切机下一组分切计划对应的点位 diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml index f2c289916..040815d30 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml @@ -50,6 +50,7 @@ `bst_ivt_cutpointivt` bcp WHERE bcp.point_type = '3' AND bcp.point_status = '1' AND bcp.is_used = '1' AND bcp.product_area = #{area} + AND bcp.point_location = #{location} AND 0 = ( SELECT COUNT(*) FROM sch_base_task t WHERE t.task_status '07' AND (t.point_code2 = bcp.point_code OR t.point_code2 = bcp.truss_point_code1 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 426e320d2..c84631c4d 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 @@ -46,16 +46,15 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; -import java.util.Objects; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import java.util.stream.Stream; +import static org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil.getPointLocationInCutDevice; +import static org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil.getNumberByResourceCode; + /** * @author lyd * @description 服务接口 @@ -393,7 +392,9 @@ public class SlitterServiceImpl implements SlitterService { if (timePlans.size() == 0) { // 如果没有下一组的分切计划，就只做下卷任务（判断下单/下双） // 获取分切对接位没任务的空位置 - List emptyPoints = slitterMapper.getEmptyCutPointNotTask(area, device.getSort_seq()); + List emptyPoints = slitterMapper.getEmptyCutPointNotTask(area, + device.getSort_seq(), + getPointLocationInCutDevice(getNumberByResourceCode(demoPlan.getResource_name()))); if (emptyPoints.size() == 0) { log.error("分切机【" + device.getExt_code() + "】找不到对应的对接位!"); throw new BadRequestException("分切机【" + device.getExt_code() + "】找不到对应的对接位!"); 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 9747a45ce..adf830794 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 @@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; 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.List; import java.util.StringJoiner; @@ -150,4 +151,31 @@ public class SlitterTaskUtil { } } + /** + * 获取设备号 + * @param resourceCode / + * @return / + */ + public static int getNumberByResourceCode(String resourceCode) { + if (ObjectUtil.isEmpty(resourceCode)) { + throw new BadRequestException("输入的设备号编码不能为空!"); + } + String trimStr = resourceCode.trim(); + // 提取最后两位作为字符串 + String lastTwoDigitsString = trimStr.substring(trimStr.length() - 2); + // 将整数再转换回字符串以供返回 + return Integer.parseInt(lastTwoDigitsString); + } + + /** + * 获取上下区域 + * @param num / + * @return / + */ + public static String getPointLocationInCutDevice(int num) { + if (num >= 1 && num <= 5) { + return "0"; + } + return "1"; + } } From 87ebb39603ec591d7841a6847e7c5fd1e952f05a Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Mon, 24 Jun 2024 16:25:41 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix:MES=E5=AF=B9=E6=8E=A5=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/PdmBiSubpackagerelation.java | 6 +- .../impl/BstIvtBoxinfoServiceImpl.java | 15 ++ .../util/impl/InBoxManageServiceImpl.java | 14 +- .../util/impl/InVehicleManageServiceImpl.java | 1 + .../util/impl/OutBoxManageServiceImpl.java | 1 + .../iostorInv/util/wql/BST_INVEHICLE.wql | 3 + .../wms/ext/mes/rest/BLmsToMesController.java | 40 ----- .../wms/ext/mes/rest/LmsToMesController.java | 18 ++ .../mes/service/impl/LmsToMesServiceImpl.java | 21 ++- .../mes/service/impl/MesToLmsServiceImpl.java | 158 ++++++++++++++++-- .../bi/service/dto/SubpackagerelationDto.java | 6 +- 11 files changed, 211 insertions(+), 72 deletions(-) delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/BLmsToMesController.java diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/PdmBiSubpackagerelation.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/PdmBiSubpackagerelation.java index 61f667cb7..836d85d84 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/PdmBiSubpackagerelation.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/PdmBiSubpackagerelation.java @@ -117,19 +117,19 @@ public class PdmBiSubpackagerelation extends Model { /** * 单位面积质量 */ - private BigDecimal mass_per_unit_area; + private String mass_per_unit_area; /** * 净重 */ - private BigDecimal net_weight; + private String net_weight; /** * 长度 */ - private BigDecimal length; + private String length; /** diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/impl/BstIvtBoxinfoServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/impl/BstIvtBoxinfoServiceImpl.java index 27dbc3e41..5fb64b0b2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/impl/BstIvtBoxinfoServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/impl/BstIvtBoxinfoServiceImpl.java @@ -9,6 +9,8 @@ import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxinfoService; import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxinfo; import org.nl.b_lms.storage_manage.database.service.dao.mapper.BstIvtBoxinfoMapper; import org.nl.common.utils.IdUtil; +import org.nl.system.service.param.ISysParamService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -28,6 +30,9 @@ public class BstIvtBoxinfoServiceImpl extends ServiceImpl queryAll(Map whereJson, Pageable page) { @@ -46,6 +51,15 @@ public class BstIvtBoxinfoServiceImpl extends ServiceImpl '' @@ -113,6 +115,7 @@ attr.is_used = '1' AND attr.is_delete = '0' AND attr.lock_type = '1' + AND height = '2' AND IFNULL(attr.storagevehicle_code,'') = '' AND attr.stor_id = 输入.stor_id AND attr.sect_id = 输入.sect_id diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/BLmsToMesController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/BLmsToMesController.java deleted file mode 100644 index ab2106a67..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/BLmsToMesController.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.nl.wms.ext.mes.rest; - -import com.alibaba.fastjson.JSONObject; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.logging.annotation.Log; -import org.nl.wms.ext.mes.service.LmsToMesService; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequiredArgsConstructor - -@RequestMapping("/CamstarApi") -@Slf4j -public class BLmsToMesController { - private final LmsToMesService lmsToMesService; - - @PostMapping("/momAutoTransterMoveIn") - @Log("表处、分切上料反馈接口") - public ResponseEntity momAutoTransterMoveIn(@RequestBody JSONObject jo) { - return new ResponseEntity<>(lmsToMesService.momAutoTransterMoveIn(jo), HttpStatus.OK); - } - - @PostMapping("/momGetPackingInfo") - @Log("LMS通过木箱号调用木箱信息") - public ResponseEntity momGetPackingInfo(@RequestBody JSONObject jo) { - return new ResponseEntity<>(lmsToMesService.momGetPackingInfo(jo), HttpStatus.OK); - } - - @PostMapping("/momBoxPackageSubmit") - @Log("LMS装箱完成传MES包装关系") - public ResponseEntity momBoxPackageSubmit(@RequestBody JSONObject jo) { - return new ResponseEntity<>(lmsToMesService.momBoxPackageSubmit(jo), HttpStatus.OK); - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/LmsToMesController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/LmsToMesController.java index 71a49963f..4f7c69aea 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/LmsToMesController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/LmsToMesController.java @@ -117,4 +117,22 @@ public class LmsToMesController { public ResponseEntity ChildScrapUpdate(@RequestBody JSONObject jo) { return new ResponseEntity<>(lmsToMesService.ChildScrapUpdate(jo), HttpStatus.OK); } + + @PostMapping("/momAutoTransterMoveIn") + @Log("表处、分切上料反馈接口") + public ResponseEntity momAutoTransterMoveIn(@RequestBody JSONObject jo) { + return new ResponseEntity<>(lmsToMesService.momAutoTransterMoveIn(jo), HttpStatus.OK); + } + + @PostMapping("/momGetPackingInfo") + @Log("LMS通过木箱号调用木箱信息") + public ResponseEntity momGetPackingInfo(@RequestBody JSONObject jo) { + return new ResponseEntity<>(lmsToMesService.momGetPackingInfo(jo), HttpStatus.OK); + } + + @PostMapping("/momBoxPackageSubmit") + @Log("LMS装箱完成传MES包装关系") + public ResponseEntity momBoxPackageSubmit(@RequestBody JSONObject jo) { + return new ResponseEntity<>(lmsToMesService.momBoxPackageSubmit(jo), HttpStatus.OK); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java index 23fabe3cf..f51d82f0c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java @@ -707,15 +707,15 @@ public class LmsToMesServiceImpl implements LmsToMesService { String to_area = param.getString("to_area"); String container_name = param.getString("container_name"); - if (StrUtil.isEmpty(from_area)){ + if (StrUtil.isEmpty(from_area)) { throw new BadRequestException("起始区域不能为空！"); } - if (StrUtil.isEmpty(to_area)){ + if (StrUtil.isEmpty(to_area)) { throw new BadRequestException("目的区域不能为空！"); } - if (StrUtil.isEmpty(container_name)){ + if (StrUtil.isEmpty(container_name)) { throw new BadRequestException("子卷号不能为空！"); } @@ -808,19 +808,19 @@ public class LmsToMesServiceImpl implements LmsToMesService { String box_weight = param.getString("box_weight"); JSONArray rows = param.getJSONArray("rows"); - if(StrUtil.isEmpty(box_no)){ + if (StrUtil.isEmpty(box_no)) { throw new BadRequestException("木箱号不能为空！"); } - if(StrUtil.isEmpty(num)){ + if (StrUtil.isEmpty(num)) { throw new BadRequestException("箱内子卷数不能为空！"); } - if(StrUtil.isEmpty(box_weight)){ + if (StrUtil.isEmpty(box_weight)) { throw new BadRequestException("木箱毛重不能为空！"); } - if(ObjectUtil.isEmpty(rows)){ + if (ObjectUtil.isEmpty(rows)) { throw new BadRequestException("箱内子卷信息不能为空！"); } @@ -834,14 +834,17 @@ public class LmsToMesServiceImpl implements LmsToMesService { String Password = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_PASSWORD").getValue(); param.put("UserName", UserName); param.put("Password", Password); - param.put("ContainerName", box_no); + param.put("PackageBoxSN", box_no); + param.put("QuanlityInBox", num); + param.put("BoxWeight", box_weight); + param.put("ContainerList", box_weight); try { String resultMsg = HttpRequest.post(url) .body(String.valueOf(param)) .execute().body(); result = JSONObject.parseObject(resultMsg); - log.info("momGetPackingInfo接口输出参数为：-------------------" + result.toString()); + log.info("momBoxPackageSubmit接口输出参数为：-------------------" + result.toString()); String RTYPE = result.getString("RTYPE"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java index f351df350..5338ecd04 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java @@ -8,13 +8,16 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.checkerframework.checker.units.qual.C; import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproductionplanService; import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan; +import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation; import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService; import org.nl.b_lms.sch.tasks.ProcessTask; @@ -32,6 +35,7 @@ import org.nl.wms.ext.mes.service.MesToLmsService; import org.nl.wms.pda.mps.service.InService; import org.nl.wms.pda.mps.service.OutService; import org.nl.wms.pda.mps.service.impl.BakingServiceImpl; +import org.nl.wms.pdm.bi.service.dto.SubpackagerelationDto; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.tasks.CoolCutTask; import org.nl.wms.st.inbill.service.CheckOutBillService; @@ -1736,6 +1740,32 @@ public class MesToLmsServiceImpl implements MesToLmsService { public JSONObject momSendSplitMfgOrderBOM(JSONObject param) { log.info("momSendSplitMfgOrderBOM输入参数为：-------------------" + param.toString()); + /* MES传递的入参内容 + [ + { + "MfgOrderName": "25529502-20230926$02#02", + "ProductName": "44151000900045", + "Description": "木制包装容器及板材|木箱|650|4|3|1290*750*494", + "CarrierName": "48221000000001", + "CarrierDescription": "纸制筒管|纸管|3英寸|650", + "Type": "RW2", + "HL01": "A+", + "HL02": "520", + "HL03": "1,538.000", + "HL031": "2,000.000", + "HL04": "100.000", + "HL041": "130.000", + "HL05": "20,000.000", + "HL06": "CC", + "HL07": "4", + "HL08": "ZT1(纸筒-3寸)", + "HL081": "650", + "HL09": "ROF(毛面朝外)", + "HL10": "纸管长度650，中性包装", + "HL11": null + } +]*/ + JSONObject resultParam = new JSONObject(); resultParam.put("RTYPE", "S"); resultParam.put("Code", "0"); @@ -1748,27 +1778,51 @@ public class MesToLmsServiceImpl implements MesToLmsService { public JSONObject getRollInfo(JSONObject param) { String ContainerName = param.getString("ContainerName"); PdmBiSlittingproductionplan one = slittingproductionplanService.getOne(new LambdaQueryWrapper().eq(PdmBiSlittingproductionplan::getContainer_name, ContainerName)); - if (ObjectUtil.isEmpty(one)){ - throw new BadRequestException("未查询到子卷号为["+ContainerName+"]的分切计划！"); + if (ObjectUtil.isEmpty(one)) { + throw new BadRequestException("未查询到子卷号为[" + ContainerName + "]的分切计划！"); } JSONObject resultParam = new JSONObject(); - resultParam.put("ContainerName",ContainerName); - resultParam.put("ResourceName",""); - resultParam.put("Weight",one.getWeight()); - resultParam.put("WeighDate",DateUtil.now()); - resultParam.put("Type",one.getPaper_tube_or_FRP()); - resultParam.put("CarrierWeight",one.getPaper_weight()); + resultParam.put("ContainerName", ContainerName); + resultParam.put("ResourceName", ""); + resultParam.put("Weight", one.getWeight()); + resultParam.put("WeighDate", DateUtil.now()); + resultParam.put("Type", one.getPaper_tube_or_FRP()); + resultParam.put("CarrierWeight", one.getPaper_weight()); return resultParam; } @Override public JSONObject sendLevelInfo(JSONObject param) { log.info("sendLevelInfo输入参数为：-------------------" + param.toString()); - JSONObject resultParam = new JSONObject(); - resultParam.put("RTYPE", "S"); - resultParam.put("Code", "0"); - resultParam.put("RTMSG", "操作成功!"); + + String ContainerName = param.getString("ContainerName"); + String Level = param.getString("Level"); + + try { + if (StrUtil.isEmpty(ContainerName)) { + throw new BadRequestException("子卷号不能为空！"); + } + if (StrUtil.isEmpty(Level)) { + throw new BadRequestException("子卷等级不能为空！"); + } + + PdmBiSlittingproductionplan plan = slittingproductionplanService.getOne(new LambdaQueryWrapper().eq(PdmBiSlittingproductionplan::getContainer_name, ContainerName) + .eq(PdmBiSlittingproductionplan::getIs_delete, "0")); + if (ObjectUtil.isEmpty(plan)) { + throw new BadRequestException("未查询到对应的分切计划！"); + } + plan.setLevel(Level); + slittingproductionplanService.update(plan); + resultParam.put("RTYPE", "S"); + resultParam.put("Code", "0"); + resultParam.put("RTMSG", "操作成功!"); + } catch (Exception e) { + resultParam.put("RTYPE", "E"); + resultParam.put("Code", "1"); + resultParam.put("RTMSG", "操作失败!，" + e.getMessage()); + } + return resultParam; } @@ -1787,6 +1841,86 @@ public class MesToLmsServiceImpl implements MesToLmsService { @Override public JSONObject sendSubInfo(JSONObject param) { + + /* {"ContainerName":"A1222211290105A3", + "SAPLotNumber":"A000000168", + "SaleOrderName":"100000022-100", + "CustomerName":"10000282", + "CustomerDescription":"深圳市金泰莱新材料有限公司", + "WidthPlan":null,"ThicknessPlan":"6", + "Width":"710","Thickness":"1", + "MassPerUnitArea":"1","NetWeight":204.906, + "Length":"6500","DateOfProduction":"2024-05-24", + "isUnPlanProduction":"0", + "UnPlanProductProperty1":"面密度/g/m²:1|面密度极差/g/m²:0.4|铬含量/ppm:1|断裂伸长率/%:1.0|高温抗氧化性（150℃|10min）:1|M面光泽度/GU:1|M面粗糙度Rz/μm:1|S面粗糙度Ra/μm:1|抗拉强度/Mpa:1.0|厚度/μm:1|润湿性/mN/m - ≥:1|翘曲/mm:1", + "UnPlanProductProperty2":"", + "UnPlanProductProperty3":"", + "SOTensileStrengthLowerLimit":null, + "ETTensileStrengthLowerLimit":"300", + "TensileStrength":"1.0"}*/ + + //子卷号 + String ContainerName = param.getString("ContainerName"); + //SAP批次 + String SAPLotNumber = param.getString("SAPLotNumber"); + //销售订单及行号 + String SaleOrderName = param.getString("SaleOrderName"); + //客户编号 + String CustomerName = param.getString("CustomerName"); + //客户名称 + String CustomerDescription = param.getString("CustomerDescription"); + //计划幅宽 + String WidthPlan = param.getString("WidthPlan"); + //计划厚度 + String ThicknessPlan = param.getString("ThicknessPlan"); + //产品幅宽 + String Width = param.getString("Width"); + //产品厚度 + String Thickness = param.getString("Thickness"); + //单位面积质量 + String MassPerUnitArea = param.getString("MassPerUnitArea"); + //净重 + String NetWeight = param.getString("NetWeight"); + //长度 + String Length = param.getString("Length"); + //制造完成日期 + String DateOfProduction = param.getString("DateOfProduction"); + //计划外分切的子卷 + String isUnPlanProduction = param.getString("isUnPlanProduction"); + //子卷的物性值1 + String UnPlanProductProperty1 = param.getString("UnPlanProductProperty1"); + //子卷的物性值2 + String UnPlanProductProperty2 = param.getString("UnPlanProductProperty2"); + //子卷的物性值3 + String UnPlanProductProperty3 = param.getString("UnPlanProductProperty3"); + //客户需求抗拉下限 + String SOTensileStrengthLowerLimit = param.getString("SOTensileStrengthLowerLimit"); + //内控标准抗拉下限 + String ETTensileStrengthLowerLimit = param.getString("ETTensileStrengthLowerLimit"); + //生产实际抗拉值 + String TensileStrength = param.getString("TensileStrength"); + + PdmBiSubpackagerelation dto = new PdmBiSubpackagerelation(); + dto.setContainer_name(ContainerName); + dto.setSap_pcsn(SAPLotNumber); + dto.setSale_order_name(SaleOrderName); + dto.setContainer_name(CustomerName); + dto.setCustomer_description(CustomerDescription); + dto.setWidth(Width); + dto.setThickness(Thickness); + dto.setMass_per_unit_area(MassPerUnitArea); + dto.setNet_weight(NetWeight); + dto.setLength(Length); + dto.setDate_of_production(DateOfProduction); + dto.setIs_un_plan_production(isUnPlanProduction); + dto.setUn_plan_product_property1(UnPlanProductProperty1); + dto.setUn_plan_product_property2(UnPlanProductProperty2); + dto.setUn_plan_product_property3(UnPlanProductProperty3); + dto.setDemand_limit(SOTensileStrengthLowerLimit); + dto.setStandard_limit(ETTensileStrengthLowerLimit); + dto.setActual_value(TensileStrength); + + log.info("sendSubInfo输入参数为：-------------------" + param.toString()); JSONObject resultParam = new JSONObject(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/dto/SubpackagerelationDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/dto/SubpackagerelationDto.java index de3d0c90a..2571965e6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/dto/SubpackagerelationDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/dto/SubpackagerelationDto.java @@ -90,17 +90,17 @@ public class SubpackagerelationDto implements Serializable { /** * 单位面积质量 */ - private BigDecimal mass_per_unit_area; + private String mass_per_unit_area; /** * 净重 */ - private BigDecimal net_weight; + private String net_weight; /** * 长度 */ - private BigDecimal length; + private String length; /** * 制造完成日期 From 0814124414ae0266211a6658acfa53d18ed3d76c Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 24 Jun 2024 17:39:45 +0800 Subject: [PATCH 6/6] =?UTF-8?q?rev=EF=BC=9A=E4=BA=8C=E6=AC=A1=E5=88=86?= =?UTF-8?q?=E9=85=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/nl/b_lms/sch/tasks/TwoSendOutTask.java | 4 +++- .../java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java | 4 ++-- .../src/main/java/org/nl/wms/sch/AcsTaskDto.java | 6 ------ 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoSendOutTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoSendOutTask.java index 459318cc8..a70e335b2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoSendOutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoSendOutTask.java @@ -45,6 +45,8 @@ public class TwoSendOutTask extends AbstractAcsTask { JSONArray arr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0'").getResultJSONArray(0); // 获取系统参数 String expandWidthLength = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("expandWidthLength").getValue(); + JSONObject param = new JSONObject(); + param.put("expandWidthLength",expandWidthLength); ArrayList resultList = new ArrayList<>(); for (int i = 0; i < arr.size(); i++) { @@ -65,7 +67,7 @@ public class TwoSendOutTask extends AbstractAcsTask { .dtl_type(String.valueOf(dtl_type)) .route_plan_code(getRoutePlanCode(json.getString("point_code1"))) .remark(json.getString("remark")) - .expandWidthLength(expandWidthLength) + .interaction_json(param) .build(); resultList.add(dto); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java index 0cfd0678a..f8527b61e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java @@ -104,8 +104,8 @@ public enum IOSEnum { "6","CK2046", "7","7", "8","8", "9","9", "10","10")), // 出库发货等待点 - OUT_FH_POINT(MapOf.of("1","B_FH_01_0", "2","B_FH_02_0", "3","B_FH_03_0", "4","B_FH_04_0" ,"5","B_FH_05_0", - "6","B_FH_06_0")), + OUT_FH_POINT(MapOf.of("1","B_FH01_0", "2","B_FH02_0", "3","B_FH03_0", "4","B_FH04_0" ,"5","B_FH05_0", + "6","B_FH06_0")), // 行架点位 OUT_HANGER(MapOf.of("行架位1", "CK2013","行架位2", "CK2017")), diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsTaskDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsTaskDto.java index 0e44bb89c..e6ee2a257 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsTaskDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsTaskDto.java @@ -140,10 +140,4 @@ public class AcsTaskDto { private String barcode; - /** - * 发货任务下发货叉宽度 - */ - private String expandWidthLength; - - }