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

fix: 查找剩余同组分切计划BUG

Browse Source
This commit is contained in:
liyongde
2024-06-14 16:29:05 +08:00
parent aed5b198ba
commit 4a1269fe45
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml
View File

@@ -133,6 +133,7 @@
<foreach item="item" index="index" collection="qzzs" open="(" separator="," close=")"> <foreach item="item" index="index" collection="qzzs" open="(" separator="," close=")">
#{item} #{item}
</foreach> </foreach>
OR p1.qzzno IS NULL
) )
SELECT SELECT
resource_name, resource_name,

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

@@ -10,8 +10,8 @@
`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 (LENGTH(bic.qzz_no1) = 0 OR LENGTH(bic.qzz_no2) = 0) AND (LENGTH(bct.qzz_no1) = 0 OR LENGTH(bct.qzz_no2) = 0)
AND (LENGTH(bic.qzz_no1) <![CDATA[ > ]]> 0 OR LENGTH(bic.qzz_no2) <![CDATA[ > ]]> 0) AND (LENGTH(bct.qzz_no1) <![CDATA[ > ]]> 0 OR LENGTH(bct.qzz_no2) <![CDATA[ > ]]> 0)
AND bct.is_used = '1' AND bct.is_used = '1'
LIMIT 1 LIMIT 1
</select> </select>

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

@@ -136,7 +136,7 @@ public class SlitterServiceImpl implements SlitterService {
: ""); : "");
con.put("number", ObjectUtil.isNotEmpty(point.getTube_code1()) && ObjectUtil.isNotEmpty(point.getTube_code2()) con.put("number", ObjectUtil.isNotEmpty(point.getTube_code1()) && ObjectUtil.isNotEmpty(point.getTube_code2())
? "2" : "1"); ? "2" : "1");
res.put("code", HttpStatus.HTTP_OK); res.put("status", HttpStatus.HTTP_OK);
res.put("message", "任务请求成功!"); res.put("message", "任务请求成功!");
return res; return res;
} }
@@ -155,7 +155,7 @@ public class SlitterServiceImpl implements SlitterService {
TaskUtils.updateOptMessageByBShaftPoint(CBJ); TaskUtils.updateOptMessageByBShaftPoint(CBJ);
shafttubeivtService.updateById(CBJ); shafttubeivtService.updateById(CBJ);
} }
res.put("code", HttpStatus.HTTP_OK); res.put("status", HttpStatus.HTTP_OK);
res.put("message", "请求成功"); res.put("message", "请求成功");
return res; return res;
} }
@@ -184,7 +184,7 @@ public class SlitterServiceImpl implements SlitterService {
r.put("device_code", deviceCode); r.put("device_code", deviceCode);
SlitterTaskUtil.putCurrentPaperSpec(r, plans); SlitterTaskUtil.putCurrentPaperSpec(r, plans);
r.put("pullCount", plans.size()); r.put("pullCount", plans.size());
res.put("code", HttpStatus.HTTP_OK); res.put("status", HttpStatus.HTTP_OK);
res.put("message", "请求成功"); res.put("message", "请求成功");
return res; return res;
} }
@@ -295,7 +295,7 @@ public class SlitterServiceImpl implements SlitterService {
lockPoint.unlock(); lockPoint.unlock();
} }
} }
res.put("code", HttpStatus.HTTP_OK); res.put("status", HttpStatus.HTTP_OK);
res.put("message", "请求成功"); res.put("message", "请求成功");
return res; return res;
} }
@@ -332,7 +332,7 @@ public class SlitterServiceImpl implements SlitterService {
param.put("product_area", SlitterConstant.SLITTER_TASK_AREA); param.put("product_area", SlitterConstant.SLITTER_TASK_AREA);
param.put("is_bushing", "0"); param.put("is_bushing", "0");
trussCallShaftCacheTask.createTask(param); trussCallShaftCacheTask.createTask(param);
res.put("code", HttpStatus.HTTP_OK); res.put("status", HttpStatus.HTTP_OK);
res.put("message", "请求成功"); res.put("message", "请求成功");
return res; return res;
} }
@@ -639,7 +639,7 @@ public class SlitterServiceImpl implements SlitterService {
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"); taskParam.put("to_is_labeling", "0");
res.put("code", HttpStatus.HTTP_OK); res.put("status", HttpStatus.HTTP_OK);
res.put("message", "请求成功!"); res.put("message", "请求成功!");
res.put("data", taskParam); res.put("data", taskParam);
return res; return res;