root/lanzhouhailiang_one
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 bc4fd0c139
commit 774fb2baa2
4 changed files with 6 additions and 4 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">
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'

4
lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java
View File

@@ -46,7 +46,7 @@ public class MdPbPapervehicleServiceImpl extends ServiceImpl<MdPbPapervehicleMap
String now = DateUtil.now();
entity.setIvt_id(IdUtil.getSnowflake(1, 1).nextIdStr());
entity.setUpdate_optid(Long.valueOf(currentUserId));
entity.setUpdate_optid(currentUserId);
entity.setUpdate_optname(nickName);
entity.setUpdate_time(now);
mdPbPapervehicleMapper.insert(entity);
@@ -62,7 +62,7 @@ public class MdPbPapervehicleServiceImpl extends ServiceImpl<MdPbPapervehicleMap
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
entity.setUpdate_optid(Long.valueOf(currentUserId));
entity.setUpdate_optid(currentUserId);
entity.setUpdate_optname(nickName);
entity.setUpdate_time(now);

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));
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

@@ -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);