root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:内包间代码逻辑优化

Browse Source
This commit is contained in:
zhouz
2024-06-11 09:53:22 +08:00
parent c2a186d387
commit e9f0a3fcad
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml
View File

@@ -48,7 +48,8 @@
resultType="org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt"> resultType="org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt">
SELECT DISTINCT bic.*, sc.qzz_generation, p.qzz_size SELECT DISTINCT bic.*, sc.qzz_generation, p.qzz_size
FROM bst_ivt_cutpointivt bic 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 LEFT JOIN st_ivt_cutpointivt sc ON sc.ext_code = p.resource_name
WHERE bic.point_type = '1' WHERE bic.point_type = '1'
AND bic.is_used = '1' AND bic.is_used = '1'

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java
View File

@@ -79,7 +79,7 @@ public class AutoSendAirShaftAgvTask {
.eq(PdmBiSlittingproductionplan::getIs_delete, SlitterConstant.SLITTER_NO)); .eq(PdmBiSlittingproductionplan::getIs_delete, SlitterConstant.SLITTER_NO));
if (list.size() > 0) { if (list.size() > 0) {
// 还有不同轴，所以不继续 // 还有不同轴，所以不继续
break; continue;
} }
} }
// 如果两个气涨轴编码则表示一组满了 // 如果两个气涨轴编码则表示一组满了

1
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
View File

@@ -636,6 +636,7 @@ public class SlitterServiceImpl implements SlitterService {
JSONObject taskParam = new JSONObject(); JSONObject taskParam = new JSONObject();
taskParam.put("point_code2", one.getPoint_code()); taskParam.put("point_code2", one.getPoint_code());
taskParam.put("material_code", plan.getContainer_name()); taskParam.put("material_code", plan.getContainer_name());
taskParam.put("to_is_labeling", "0");
res.put("code", HttpStatus.HTTP_OK); res.put("code", HttpStatus.HTTP_OK);
res.put("message", "请求成功!"); res.put("message", "请求成功!");
res.put("data", taskParam); res.put("data", taskParam);