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

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

Browse Source
This commit is contained in:
zhouz
2025-09-28 10:10:53 +08:00
parent 7c2e6d7d7d 56ebd7734f
commit a277c92bf2
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.http.HttpStatus;
import com.alibaba.fastjson.JSONArray;
@@ -316,9 +317,9 @@ public class SlitterServiceImpl implements SlitterService {
if (tryLock) {
log.info("ACS申请套管完成参数: {}", param);
// 纸管
String weight1 = param.getString("weight1");
BigDecimal weight1 = param.getBigDecimal("weight1");
String material1 = param.getString("material1");
String weight2 = param.getString("weight2");
BigDecimal weight2 = param.getBigDecimal("weight2");
String material2 = param.getString("material2");
BstIvtShafttubeivt startPoint = shafttubeivtService.getOne(new LambdaQueryWrapper<BstIvtShafttubeivt>()
.eq(BstIvtShafttubeivt::getPoint_code, deviceCode));
@@ -415,10 +416,10 @@ public class SlitterServiceImpl implements SlitterService {
// 分切计划设置纸卷重量
for (PdmBiSlittingproductionplan plan : plans) {
if (SlitterConstant.SLITTER_SUB_VOLUME_LEFT.equals(plan.getLeft_or_right())) {
plan.setPaper_weight(weight1);
plan.setPaper_weight(String.valueOf(NumberUtil.round(weight1, 2)));
msg = msg + "子卷号：" + plan.getContainer_name() + "的纸管重量: " + weight1 + " | ";
} else {
plan.setPaper_weight(weight2);
plan.setPaper_weight(String.valueOf(NumberUtil.round(weight2, 2)));
msg = msg + "子卷号：" + plan.getContainer_name() + "的纸管重量: " + weight2 + " | ";
}
TaskUtils.updateOptMessageBySlitterPlan(plan);