From 774fb2baa2773ab62b010d3ac00343fd2520e1fa Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Tue, 11 Jun 2024 09:53:22 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=E5=86=85=E5=8C=85=E9=97=B4=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/dao/mapper/BstIvtCutpointivtMapper.xml | 3 ++- .../service/impl/MdPbPapervehicleServiceImpl.java | 4 ++-- .../b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java | 2 +- .../sch/tasks/slitter/service/impl/SlitterServiceImpl.java | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml index e6be015bf..0dd7c4c97 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml @@ -48,7 +48,8 @@ resultType="org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt"> SELECT DISTINCT bic.*, sc.qzz_generation, p.qzz_size FROM bst_ivt_cutpointivt bic - LEFT JOIN pdm_bi_slittingproductionplan p ON p.qzzno = bic.qzz_no1 OR p.qzzno = bic.qzz_no2 + LEFT JOIN pdm_bi_slittingproductionplan p ON ((p.qzzno = bic.qzz_no1 AND IFNULL(bic.qzz_no1,'') != '') + OR (p.qzzno = bic.qzz_no2 AND IFNULL(bic.qzz_no2,'') != '')) LEFT JOIN st_ivt_cutpointivt sc ON sc.ext_code = p.resource_name WHERE bic.point_type = '1' AND bic.is_used = '1' diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java index a60938b57..3b21ac2e7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java @@ -46,7 +46,7 @@ public class MdPbPapervehicleServiceImpl extends ServiceImpl 0) { // 还有不同轴，所以不继续 - break; + continue; } } // 如果两个气涨轴编码则表示一组满了 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 a65ce06fa..16677e77f 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 @@ -630,6 +630,7 @@ public class SlitterServiceImpl implements SlitterService { JSONObject taskParam = new JSONObject(); taskParam.put("point_code2", one.getPoint_code()); taskParam.put("material_code", plan.getContainer_name()); + taskParam.put("to_is_labeling", "0"); res.put("code", HttpStatus.HTTP_OK); res.put("message", "请求成功!"); res.put("data", taskParam); From 46c641b96b6cd64c9023c0e1ac92ce1c3af91a21 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Tue, 11 Jun 2024 14:48:31 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BB=BB=E5=8A=A1=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=AE=8C=E6=95=B4=E6=B0=94=E8=83=80=E8=BD=B4=E7=BC=96?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sch/tasks/slitter/service/impl/SlitterServiceImpl.java | 5 +++-- 1 file changed, 3 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 eefc4ca6a..de5b93afb 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 @@ -268,10 +268,11 @@ public class SlitterServiceImpl implements SlitterService { String qzzNo = resourceName.substring(0, 2) + resourceName.substring(resourceName.length() - 2) + demoPlan.getSplit_group() - + TaskUtils.getDateTime("MMddHHmm") + "-"; + + TaskUtils.getDateTime("MMddHHmm") + "-" + + demoPlan.getUp_or_down(); plans.forEach(plan -> { plan.setIs_child_tz_ok(SlitterConstant.SLITTER_YES); - plan.setQzzno(qzzNo + plan.getUp_or_down()); + plan.setQzzno(qzzNo); TaskUtils.updateOptMessageBySlitterPlan(plan); }); slittingproductionplanService.updateBatchById(plans); From c2384e73a45f8c6e5dc681b2eaff6c73bedcd925 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Wed, 12 Jun 2024 10:13:52 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E6=89=8B=E6=8C=81=E7=A9=BF?= =?UTF-8?q?=E6=8B=94=E8=BD=B4=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IBstIvtShafttubeivtService.java | 16 ++++-- .../impl/BstIvtShafttubeivtServiceImpl.java | 14 ++++- .../pda/controller/SlitterPdaController.java | 13 +++++ .../task/dao/mapper/SchBaseTaskMapper.java | 8 ++- .../sch/task/dao/mapper/SchBaseTaskMapper.xml | 10 ++-- .../sch/task/service/IschBaseTaskService.java | 8 +-- .../service/impl/SchBaseTaskServiceImpl.java | 4 +- .../tasks/slitter/service/SlitterService.java | 13 +++++ .../service/impl/SlitterServiceImpl.java | 56 +++++++++++++++++++ 9 files changed, 123 insertions(+), 19 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/IBstIvtShafttubeivtService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/IBstIvtShafttubeivtService.java index f0ab9b2b9..9d358fdfb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/IBstIvtShafttubeivtService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/IBstIvtShafttubeivtService.java @@ -45,10 +45,10 @@ public interface IBstIvtShafttubeivtService extends IService /** * 获取启用的 类型 区域 有无轴的点位 (无任务) - * @param type - * @param location - * @param have - * @return + * @param type 1,2,3,4,5,6 + * @param location 0 1 + * @param have 0 1 + * @return / */ List getAllShaftPointsByConditions(String type, String location, String have); @@ -60,6 +60,14 @@ public interface IBstIvtShafttubeivtService extends IService */ BstIvtShafttubeivt getByPointCode(String point, boolean flag); + /** + * 根据点位类型获取点位 + * @param type 类型 1气胀轴库, 2穿拔轴点位, 3套管工位, 4成品称重位, 5废箔称重位, 6B气胀轴暂存 + * @param flag 是否需要校验启用 + * @return / + */ + List getAllByPointType(String type, boolean flag); + /** * 获得气胀轴库对应的气涨轴位置 * @param qzzSize 气涨轴尺寸 diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/impl/BstIvtShafttubeivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/impl/BstIvtShafttubeivtServiceImpl.java index cd42f7a2e..b3e9a85e3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/impl/BstIvtShafttubeivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/impl/BstIvtShafttubeivtServiceImpl.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.b_lms.bst.ivt.shafttubeivt.service.dto.BstIvtShafttubeivtQuery; +import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant; import org.nl.modules.common.exception.BadRequestException; import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.SecurityUtils; @@ -97,10 +98,21 @@ public class BstIvtShafttubeivtServiceImpl extends ServiceImpl lam = new QueryWrapper().lambda(); lam.eq(BstIvtShafttubeivt::getPoint_code, point) - .eq(flag, BstIvtShafttubeivt::getIs_used, "1"); + .eq(flag, BstIvtShafttubeivt::getIs_used, SlitterConstant.SLITTER_YES); return bstIvtShafttubeivtMapper.selectOne(lam); } + @Override + public List getAllByPointType(String type, boolean flag) { + if (ObjectUtil.isEmpty(type)) { + return null; + } + LambdaQueryWrapper lam = new QueryWrapper().lambda(); + lam.eq(BstIvtShafttubeivt::getPoint_type, type) + .eq(flag, BstIvtShafttubeivt::getIs_used, SlitterConstant.SLITTER_YES); + return bstIvtShafttubeivtMapper.selectList(lam); + } + @Override public List getByQzzSize(String qzzSize, String pointCode, String location) { return bstIvtShafttubeivtMapper.getByQzzSize(qzzSize, pointCode, location); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/SlitterPdaController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/SlitterPdaController.java index cfed83a6c..2767479c1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/SlitterPdaController.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/SlitterPdaController.java @@ -46,4 +46,17 @@ public class SlitterPdaController { public ResponseEntity moveVehicle(@RequestBody JSONObject param) { return new ResponseEntity<>(slitterDevices.moveVehicle(param), HttpStatus.OK); } + + @PostMapping("/getShaftPoint") + @Log("获取套拔轴下拉框数据") + @SaIgnore + public ResponseEntity getShaftPoint() { + return new ResponseEntity<>(slitterDevices.getShaftPoint(), HttpStatus.OK); + } + @PostMapping("/doInitShaftPoint") + @Log("初始化套拔轴点位") + @SaIgnore + public ResponseEntity doInitShaftPoint(@RequestBody JSONObject param) { + return new ResponseEntity<>(slitterDevices.doInitShaftPoint(param), HttpStatus.OK); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.java index 686c41f13..9e1747236 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.java @@ -14,6 +14,10 @@ import java.util.List; */ public interface SchBaseTaskMapper extends BaseMapper { - - List checkHaveTask(BstIvtCutpointivt p); + /** + * 检测点位编码是否存在任务 + * @param code 点位编码 + * @return 任务 + */ + List checkHaveTask(String code); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.xml index c32ea418b..968ce2474 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.xml @@ -7,12 +7,10 @@ SELECT * FROM sch_base_task WHERE task_code '07' - AND ( point_code1 = #{point_code} - OR point_code2 = #{point_code} - OR point_code1 = #{truss_point_code1} - OR point_code2 = #{truss_point_code1} - OR point_code1 = #{truss_point_code2} - OR point_code2 = #{truss_point_code2} + AND ( point_code1 = #{code} + OR point_code2 = #{code} + OR point_code3 = #{code} + OR point_code4 = #{code} ) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/IschBaseTaskService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/IschBaseTaskService.java index 8766e07d7..e62b28add 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/IschBaseTaskService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/IschBaseTaskService.java @@ -61,11 +61,11 @@ public interface IschBaseTaskService extends IService { List getIssueTasks(String thisClass); /** - * 检测点位是否存在任务 - * @param p - * @return + * 检测点位编码是否存在任务 + * @param code 点位编码 + * @return 任务 */ - List checkHaveTask(BstIvtCutpointivt p); + List checkHaveTask(String code); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/impl/SchBaseTaskServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/impl/SchBaseTaskServiceImpl.java index 94a78826d..fd91c6756 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/impl/SchBaseTaskServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/impl/SchBaseTaskServiceImpl.java @@ -104,8 +104,8 @@ public class SchBaseTaskServiceImpl extends ServiceImpl checkHaveTask(BstIvtCutpointivt p) { - return schBaseTaskMapper.checkHaveTask(p); + public List checkHaveTask(String code) { + return schBaseTaskMapper.checkHaveTask(code); } 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 7a20314f4..d71ab930c 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 @@ -105,4 +105,17 @@ public interface SlitterService { * @return / */ JSONObject acsToReduceTube(JSONObject param); + + /** + * 获取气胀轴点位下拉框 + * @return / + */ + JSONArray getShaftPoint(); + + /** + * 初始化套拔轴点位 + * @param param / + * @return / + */ + JSONObject doInitShaftPoint(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 de5b93afb..6f4d481ac 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 @@ -36,6 +36,7 @@ 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.service.SlitterService; import org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil; +import org.nl.common.utils.SecurityUtils; import org.nl.common.utils.TaskUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.wms.ext.acs.service.WmsToAcsService; @@ -733,4 +734,59 @@ public class SlitterServiceImpl implements SlitterService { res.put("message", "请求成功!"); return res; } + + @Override + public JSONArray getShaftPoint() { + List allByPoint = shafttubeivtService.getAllByPointType("2", false); + JSONArray jsonArray = allByPoint.stream() + .map(item -> { + JSONObject jsonObject = new JSONObject(); + jsonObject.put("text", item.getPoint_name()); + jsonObject.put("value", item.getPoint_code()); + return jsonObject; + }) + .collect(Collectors.toCollection(JSONArray::new)); + return jsonArray; + } + + @Override + public JSONObject doInitShaftPoint(JSONObject param) { + log.info("手持穿拔轴初始化参数：{}", param); + String pointCode = param.getString("point_code"); + // 手持按钮：穿拔轴初始化 + //1、判断当前点位不能存在其他任务 + List taskList = taskService.checkHaveTask(pointCode); + if (taskList.size() > 0) { + throw new BadRequestException("操作失败，点位存在未完成的任务!"); + } + //2、把当前点位上子卷号对应的is_paper_ok改为1 + BstIvtShafttubeivt shaftPoint = shafttubeivtService.getByPointCode(pointCode, false); + if (SlitterConstant.SLITTER_NO.equals(shaftPoint.getHave_qzz())) { + throw new BadRequestException("点位不存在气胀轴信息，无需初始化!"); + } + List containers = Stream.of(shaftPoint.getContainer_name1(), shaftPoint.getContainer_name2()) + .filter(ObjectUtil::isNotEmpty).collect(Collectors.toList()); + LambdaUpdateWrapper upPlanLam = new LambdaUpdateWrapper<>(); + upPlanLam.set(PdmBiSlittingproductionplan::getIs_paper_ok, "1") + .eq(PdmBiSlittingproductionplan::getUpdate_optid, SecurityUtils.getCurrentUserId()) + .eq(PdmBiSlittingproductionplan::getUpdate_optname, SecurityUtils.getCurrentUsername()) + .eq(PdmBiSlittingproductionplan::getUpdate_time, DateUtil.now()) + .in(PdmBiSlittingproductionplan::getContainer_name, containers); + slittingproductionplanService.update(upPlanLam); + //3、清空当前穿拔轴点位的库存信息 + shaftPoint.setHave_qzz(SlitterConstant.SLITTER_NO); + shaftPoint.setTube_code1(""); + shaftPoint.setTube_code2(""); + shaftPoint.setTube_name1(""); + shaftPoint.setTube_name2(""); + shaftPoint.setContainer_name1(""); + shaftPoint.setContainer_name2(""); + shaftPoint.setQzz_size(""); + TaskUtils.updateOptMessageByBShaftPoint(shaftPoint); + shafttubeivtService.update(shaftPoint); + JSONObject res = new JSONObject(); + res.put("status", HttpStatus.HTTP_OK); + res.put("message", "请求成功!"); + return res; + } } From 6c5bc123c9857dece15b34aaed5d0f233feea637 Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Wed, 12 Jun 2024 11:24:57 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=E5=8F=8D=E9=A6=88ACS=E7=AE=A1=E8=8A=AF?= =?UTF-8?q?=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/b_lms/sch/tasks/ProcessTask.java | 6 +- .../tasks/slitter/StockAreaCallTubeTask.java | 58 +++++++++++++++++++ .../wms/ext/acs/rest/WmsToAcsController.java | 6 ++ .../wms/ext/acs/service/WmsToAcsService.java | 5 ++ .../acs/service/impl/WmsToAcsServiceImpl.java | 7 +++ .../mes/service/impl/MesToLmsServiceImpl.java | 6 +- .../main/resources/config/application-dev.yml | 8 +-- 7 files changed, 86 insertions(+), 10 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/ProcessTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/ProcessTask.java index e25dc53d8..d3f686fc2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/ProcessTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/ProcessTask.java @@ -108,7 +108,7 @@ public class ProcessTask extends AbstractAcsTask { String task_type = jsonTask.getString("task_type"); String container_name = jsonTask.getString("material_code"); - if ("010701".equals(task_type)) { + if ("011001".equals(task_type)) { //维护冷却区满轴点位的库存 JSONObject cool_jo1 = ivtTab.query("full_point_code = '" + point_code1 + "'").uniqueResult(0); String full_vehicle_code = cool_jo1.getString("full_vehicle_code"); @@ -129,7 +129,7 @@ public class ProcessTask extends AbstractAcsTask { map3.put("empty_point_status", "02"); ivtTab.update(map3, "empty_point_code = '" + point_code4 + "'"); } - if ("010702".equals(task_type)) { + if ("011002".equals(task_type)) { //维护冷却区满轴点位的库存 JSONObject cool_jo1 = ivtTab.query("full_point_code = '" + point_code1 + "'").uniqueResult(0); String full_vehicle_code = cool_jo1.getString("full_vehicle_code"); @@ -156,7 +156,7 @@ public class ProcessTask extends AbstractAcsTask { map3.put("empty_point_status", "02"); ivtTab.update(map3, "empty_point_code = '" + point_code2 + "'"); } - if ("010704".equals(task_type)) { + if ("011004".equals(task_type)) { //维护表处区点位 JSONObject st_jo1 = stTab.query("up_point_code = '" + point_code1.split("_M")[0] + "'").uniqueResult(0); String full_vehicle_code = st_jo1.getString("up_scroll"); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/StockAreaCallTubeTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/StockAreaCallTubeTask.java index 73d186301..33748cd88 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/StockAreaCallTubeTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/StockAreaCallTubeTask.java @@ -5,16 +5,21 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; +import org.nl.b_lms.bst.ivt.papervehicle.service.IMdPbPapervehicleService; +import org.nl.b_lms.bst.ivt.papervehicle.service.dao.MdPbPapervehicle; import org.nl.b_lms.bst.ivt.stockingivt.service.IBstIvtStockingivtService; import org.nl.b_lms.bst.ivt.stockingivt.service.dao.BstIvtStockingivt; import org.nl.b_lms.sch.task.dao.SchBaseTask; import org.nl.b_lms.sch.task.service.IschBaseTaskService; +import org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil; 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.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.ext.acs.service.WmsToAcsService; import org.nl.wms.sch.AcsTaskDto; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; @@ -22,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; @@ -38,6 +44,11 @@ public class StockAreaCallTubeTask extends AbstractAcsTask { private IschBaseTaskService taskService; @Autowired private IBstIvtStockingivtService stockingivtService; + @Autowired + private IMdPbPapervehicleService mdPbPapervehicleService; + @Autowired + private WmsToAcsService wmsToAcsService; + @Override public List addTask() { /* @@ -90,6 +101,34 @@ public class StockAreaCallTubeTask extends AbstractAcsTask { startPointObj.setIvt_status("0"); TaskUtils.updateOptMessageByBStockingPoint(startPointObj); stockingivtService.update(startPointObj); + + + //下发ACS点位库存信息 + List list = mdPbPapervehicleService.list(new LambdaQueryWrapper().eq(MdPbPapervehicle::getVehicle_code, task.getVehicle_code())); + String[] material_codes = new String[list.size()]; + String[] material_specs = new String[list.size()]; + int[] qtys = new int[list.size()]; + for (int i = 0; i < list.size(); i++) { + MdPbPapervehicle vehicle = list.get(i); + String material_code = vehicle.getMaterial_code(); + int qty = vehicle.getQty().intValue(); + if (containscode(material_codes, material_code)) { + int index = getIndex(material_codes, material_code); + qtys[index] += qty; + } else { + material_codes[i] = vehicle.getMaterial_code(); + String spec = SlitterTaskUtil.getComposePaperTubeInformation(vehicle.getMaterial_name()); + material_specs[i] = spec; + qtys[i] = qty; + } + } + JSONObject jsonObject = new JSONObject(); + jsonObject.put("to_material", material_codes); + jsonObject.put("to_spec", material_codes); + jsonObject.put("to_qty", qtys); + jsonObject.put("device_code", material_specs); + wmsToAcsService.getTubeMsg(jsonObject); + } // 取消 if (status.equals(IOSEnum.IS_NOTANDYES.code("否"))) { @@ -99,6 +138,25 @@ public class StockAreaCallTubeTask extends AbstractAcsTask { taskService.updateById(task); } + public boolean containscode(String[] names, String name) { + for (String n : names) { + if (name.equals(n)) { + return true; + } + } + return false; + } + + // 获取name在数组中的索引 + public int getIndex(String[] names, String name) { + for (int i = 0; i < names.length; i++) { + if (name.equals(names[i])) { + return i; + } + } + return -1; // 如果找不到返回-1 + } + @Override public String createTask(JSONObject form) { String currentUserId = SecurityUtils.getCurrentUserId(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/WmsToAcsController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/WmsToAcsController.java index c578a0999..5ef3fd500 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/WmsToAcsController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/WmsToAcsController.java @@ -134,5 +134,11 @@ public class WmsToAcsController { return new ResponseEntity<>(wmsToAcsService.getWeight(jo), HttpStatus.OK); } + @PostMapping("/getTubeMsg") + @Log(value = "反馈管芯库存信息", isInterfaceLog = true, interfaceLogType = InterfaceLogType.LMS_TO_ACS) + public ResponseEntity getTubeMsg(@RequestBody JSONObject jo) { + return new ResponseEntity<>(wmsToAcsService.getTubeMsg(jo), HttpStatus.OK); + } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java index ba9debc4e..995e097a0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java @@ -144,4 +144,9 @@ public interface WmsToAcsService { * @return / */ JSONObject getWeight(JSONObject jo); + + JSONObject getTubeMsg(JSONObject jo); + + + } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java index 10815a717..2491a7a6b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java @@ -467,4 +467,11 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { return AcsUtil.notifyAcs(api, arr); } + @Override + public JSONObject getTubeMsg(JSONObject whereJson) { + String api = "api/wms/getTubeMes"; + JSONArray arr = new JSONArray(); + arr.add(whereJson); + return AcsUtil.notifyAcs(api, arr); + } } 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 ffb33e04f..f351df350 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 @@ -1530,7 +1530,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { //取满放满 form.put("point_code1", jsonCoolIvt.getString("full_point_code")); form.put("point_code2", device_jo.getString("up_point_code") + "_M"); - form.put("task_type", "010702"); + form.put("task_type", "011002"); form.put("material_code", containerName); form.put("vehicle_code", jsonCoolIvt.getString("full_vehicle_code")); form.put("product_area", device_jo.getString("product_area")); @@ -1549,7 +1549,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { JSONObject jsonIvt = WQL.getWO("PDA_RAWFOIL_01").addParamMap(map).process().uniqueResult(0); form.put("point_code4", jsonIvt.getString("empty_point_code")); } - form.put("task_type", "010701"); + form.put("task_type", "011001"); form.put("material_code", containerName); form.put("vehicle_code", jsonCoolIvt.getString("full_vehicle_code")); form.put("product_area", device_jo.getString("product_area")); @@ -1567,7 +1567,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { form.put("point_code1", device_jo.getString("up_point_code") + "_M"); //寻找可用的冷却区满轴点位 form.put("point_code2", jsonIvt.getString("full_point_code")); - form.put("task_type", "010704"); + form.put("task_type", "011004"); form.put("material_code", containerName); form.put("vehicle_code", device_jo.getString("up_scroll")); form.put("product_area", device_jo.getString("product_area")); diff --git a/lms/nladmin-system/src/main/resources/config/application-dev.yml b/lms/nladmin-system/src/main/resources/config/application-dev.yml index 175efc335..48ffe5b35 100644 --- a/lms/nladmin-system/src/main/resources/config/application-dev.yml +++ b/lms/nladmin-system/src/main/resources/config/application-dev.yml @@ -1,15 +1,15 @@ server: - port: 9999 + port: 8010 #配置数据源 spring: datasource: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy -# url: jdbc:log4jdbc:mysql://${DB_HOST:10.1.3.91}:${DB_PORT:3306}/${DB_NAME:lms_test2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true - url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lzhl_two_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true + url: jdbc:log4jdbc:mysql://${DB_HOST:10.1.3.91}:${DB_PORT:3306}/${DB_NAME:lzhl_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true +# url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lzhl_two_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true username: ${DB_USER:root} - password: ${DB_PWD:12356} + password: ${DB_PWD:NLABC&hl123} # 初始连接数 initial-size: 5 # 最小连接数