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

fix: 手持菜单区分与清除暂存修改

Browse Source
This commit is contained in:
liyongde
2024-07-02 09:27:01 +08:00
parent 1cf2e6305d
commit a84a6544f9
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/SlitterPdaController.java
View File

@@ -81,7 +81,7 @@ public class SlitterPdaController {
} }
@PostMapping("/toCleanCutCacheInventory") @PostMapping("/toCleanCutCacheInventory")
@Log("清理分切缓存到内包间") @Log("清理分切缓存")
@SaIgnore @SaIgnore
public ResponseEntity<Object> toCleanCutCacheInventory(@RequestBody JSONObject param) { public ResponseEntity<Object> toCleanCutCacheInventory(@RequestBody JSONObject param) {
return new ResponseEntity<>(slitterDevices.toCleanCutCacheInventory(param), HttpStatus.OK); return new ResponseEntity<>(slitterDevices.toCleanCutCacheInventory(param), HttpStatus.OK);

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

@@ -142,7 +142,7 @@ public interface SlitterService {
JSONArray getCutCacheAgvPoints(); JSONArray getCutCacheAgvPoints();
/** /**
* 清理分切缓存到内包间 * 清理分切缓
* @param param / * @param param /
* @return / * @return /
*/ */

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

@@ -1003,10 +1003,16 @@ public class SlitterServiceImpl implements SlitterService {
} }
try { try {
if (openLock) { if (openLock) {
BstIvtCutpointivt agvCode = bcutpointivtService.getPintByAgvCode(pointCode, false); BstIvtCutpointivt agvCode = bcutpointivtService.getPintByTrussCode(pointCode, false);
agvCode.setQzz_no1(""); if (agvCode.getTruss_point_code1().equals(pointCode)) {
agvCode.setQzz_no2(""); agvCode.setQzz_no1("");
agvCode.setPoint_status("1"); }
if (agvCode.getTruss_point_code2().equals(pointCode)) {
agvCode.setQzz_no2("");
}
if (ObjectUtil.isEmpty(agvCode.getQzz_no1()) && ObjectUtil.isEmpty(agvCode.getQzz_no2())) {
agvCode.setPoint_status("1");
}
TaskUtils.updateOptMessageByBCutPoint(agvCode); TaskUtils.updateOptMessageByBCutPoint(agvCode);
bcutpointivtService.updateById(agvCode); bcutpointivtService.updateById(agvCode);
} else { } else {

2
lms/nladmin-system/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
View File

@@ -495,7 +495,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
roleTree.add(row); roleTree.add(row);
} }
res.put("sonTree", roleTree); res.put("sonTree", roleTree);
result.put("rf_menu" + i, res); result.put("rf_menu" + ("188".equals(res.getString("menu_id"))?1:0), res);
} }
returnjo.put("code", "1"); returnjo.put("code", "1");