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

Merge remote-tracking branch 'origin/b_lms' into b_lms

Browse Source
This commit is contained in:
gongbaoxiong
2024-06-13 23:21:31 +08:00
parent 3d8a4a0cae 81d06decbb
commit d5513d1075
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -176,7 +176,7 @@ public class AutoCallAirShaftTask {
param.put("product_area", SlitterConstant.SLITTER_TASK_AREA); param.put("product_area", SlitterConstant.SLITTER_TASK_AREA);
param.put("qzz_size", needPlan.getQzz_size()); param.put("qzz_size", needPlan.getQzz_size());
// 所需的纸管规格 // 所需的纸管规格
SlitterTaskUtil.putNeedPaperSpec(param, needPlans); SlitterTaskUtil.putNeedPaperSpec(param, needPlans);
// 当前纸管的规格信息 // 当前纸管的规格信息
String oldQzzNo = ObjectUtil.isNotEmpty(startPoint.getQzz_no1()) String oldQzzNo = ObjectUtil.isNotEmpty(startPoint.getQzz_no1())
? startPoint.getQzz_no1() : startPoint.getQzz_no2(); ? startPoint.getQzz_no1() : startPoint.getQzz_no2();

4
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml
View File

@@ -10,7 +10,9 @@
`bst_ivt_cutpointivt` bct `bst_ivt_cutpointivt` bct
LEFT JOIN pdm_bi_slittingproductionplan p ON p.qzzno = bct.qzz_no1 OR p.qzzno = bct.qzz_no2 LEFT JOIN pdm_bi_slittingproductionplan p ON p.qzzno = bct.qzz_no1 OR p.qzzno = bct.qzz_no2
WHERE bct.point_status = '2' AND p.parent_container_name = #{parent_container_name} AND p.split_group = #{split_group} WHERE bct.point_status = '2' AND p.parent_container_name = #{parent_container_name} AND p.split_group = #{split_group}
AND (bct.qzz_no1 IS NULL OR bct.qzz_no1 = '' OR bct.qzz_no2 IS NULL OR bct.qzz_no2 = '') AND (LENGTH(bic.qzz_no1) = 0 OR LENGTH(bic.qzz_no2) = 0)
AND (LENGTH(bic.qzz_no1) <![CDATA[ > ]]> 0 OR LENGTH(bic.qzz_no2) <![CDATA[ > ]]> 0)
AND bct.is_used = '1'
LIMIT 1 LIMIT 1
</select> </select>
<select id="getSameGroupTaskPoint" resultType="java.lang.String"> <select id="getSameGroupTaskPoint" resultType="java.lang.String">