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 eefc4ca6a..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; @@ -268,10 +269,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); @@ -732,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; + } }