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

fix: 97信号校验

Browse Source
This commit is contained in:
liyongde
2024-06-28 13:58:52 +08:00
parent 142fc1dfea
commit b9cf783ccd
2 changed files with 14 additions and 1 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 / * @return /
*/ */
JSONObject toCleanCutCacheInventory(JSONObject param); JSONObject toCleanCutCacheInventory(JSONObject param);
/**
* 分切拼接操作
* @param param /
* @return /
*/
JSONObject slitterSpliceOperation(JSONObject param);
} }

8
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 // point.getTube_code1() 编码 ， getTube_name1() ： 纸制筒管|纸管|6英寸|1300 or 纸制筒管|纸管|3英寸|12|650
res.put("device_code", deviceCode); res.put("device_code", deviceCode);
res.put("data", con); res.put("data", con);
if ("1".equals(autoSendEmpty.getValue())) { if ("1".equals(autoSendEmpty.getValue()) && list.size() == 0) {
con.put("is_bushing", "2"); con.put("is_bushing", "2");
} else { } else {
con.put("is_bushing", list.size() > 0 ? SlitterConstant.SLITTER_YES : SlitterConstant.SLITTER_NO); con.put("is_bushing", list.size() > 0 ? SlitterConstant.SLITTER_YES : SlitterConstant.SLITTER_NO);
@@ -973,4 +973,10 @@ public class SlitterServiceImpl implements SlitterService {
res.put("message", "库存清除成功!"); res.put("message", "库存清除成功!");
return res; return res;
} }
@Override
public JSONObject slitterSpliceOperation(JSONObject param) {
// todo:
return null;
}
} }