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

Merge branch 'master_merge' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_merge

Browse Source
This commit is contained in:
zhouz
2024-06-29 10:48:28 +08:00
parent 946857d454 66212b6ed4
commit ad068ed538
4 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java
View File

@@ -147,4 +147,11 @@ public interface SlitterService {
* @return /
*/
JSONObject toCleanCutCacheInventory(JSONObject param);
/**
* 分切拼接操作
* @param param /
* @return /
*/
JSONObject slitterSpliceOperation(JSONObject param);
}

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

@@ -139,7 +139,7 @@ public class SlitterServiceImpl implements SlitterService {
// point.getTube_code1() 编码 ， getTube_name1() ： 纸制筒管|纸管|6英寸|1300 or 纸制筒管|纸管|3英寸|12|650
res.put("device_code", deviceCode);
res.put("data", con);
if ("1".equals(autoSendEmpty.getValue())) {
if ("1".equals(autoSendEmpty.getValue()) && list.size() == 0) {
con.put("is_bushing", "2");
} else {
con.put("is_bushing", list.size() > 0 ? SlitterConstant.SLITTER_YES : SlitterConstant.SLITTER_NO);
@@ -928,12 +928,12 @@ public class SlitterServiceImpl implements SlitterService {
@Override
public JSONArray getCutCacheAgvPoints() {
List<BstIvtCutpointivt> list = bcutpointivtService.getPintByAgvCodesByPointType("3");
List<BstIvtCutpointivt> list = bcutpointivtService.getPintByAgvCodesByPointType("2");
JSONArray jsonArray = list.stream()
.map(item -> {
JSONObject jsonObject = new JSONObject();
jsonObject.put("text", item.getPoint_code());
jsonObject.put("value", item.getPoint_name());
jsonObject.put("text", item.getPoint_name());
jsonObject.put("value", item.getPoint_code());
return jsonObject;
})
.collect(Collectors.toCollection(JSONArray::new));
@@ -973,4 +973,10 @@ public class SlitterServiceImpl implements SlitterService {
res.put("message", "库存清除成功!");
return res;
}
@Override
public JSONObject slitterSpliceOperation(JSONObject param) {
// todo:
return null;
}
}

14
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java
View File

@@ -3,15 +3,13 @@ package org.nl.b_lms.sch.tasks.slitter.util;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.nl.b_lms.bst.ivt.papervehicle.service.dao.MdPbPapervehicle;
import org.nl.b_lms.bst.ivt.stockingivt.service.dao.BstIvtStockingivt;
import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan;
import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant;
import org.nl.modules.common.exception.BadRequestException;
import java.util.Arrays;
import java.util.List;
import java.util.StringJoiner;
/**
* @Author: lyd
@@ -236,9 +234,13 @@ public class SlitterTaskUtil {
qtys[i] = qty;
}
}
param.put("to_material", material_codes);
param.put("to_spec", material_codes);
param.put("to_qty", qtys);
// 转成String
String[] qtysStr = Arrays.stream(qtys)
.mapToObj(String::valueOf)
.toArray(String[]::new);
param.put("to_material", String.join(",", material_codes));
param.put("to_spec", String.join(",", material_codes));
param.put("to_qty", String.join(",", qtysStr));
param.put("device_code", material_specs);
}
}

1
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/OutBussManageService.java
View File

@@ -50,6 +50,7 @@ public interface OutBussManageService {
* @return List<StIvtIostorinvdis>: 分配明细集合
*/
List<StIvtIostorinvdis> manualDivIvt(StIvtIostorinvdtl dtlDao, List<JSONObject> ivtList);
/**
* 更新库存