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

更新

Browse Source
This commit is contained in:
loujf
2022-08-17 09:32:55 +08:00
parent 507ea6e3f3
commit 386f3561cb
3 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hd/nladmin-system/src/main/java/org/nl/hand/ndxytwo/service/impl/NdxyTwoHandServiceImpl.java
View File

@@ -564,7 +564,9 @@ public class NdxyTwoHandServiceImpl implements NdxyTwoHandService {
dto.setStart_point_code(start_device_code);
dto.setNext_device_code(next_device_code);
dto.setNext_point_code(next_device_code);
dto.setQuantity(new BigDecimal(quantity));
if (StrUtil.isNotEmpty(quantity)) {
dto.setQuantity(new BigDecimal(quantity));
}
dto.setRemark(remark);
dto.setMaterial(material_type);
try {

19
hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/HomeDataQuery.java
View File

@@ -38,16 +38,17 @@ public class HomeDataQuery {
JSONObject json = new JSONObject();
Map<String, AgvDto> agv_map = agvService.findAllAgvFromCache();
AgvDto agv1 = new AgvDto();
agv1.setName("agv1");
agv1.setEnergyLevel("70");
agv1.setState("IDLE");
agv_map.put("agv1", agv1);
AgvDto agv2 = new AgvDto();
agv2.setName("agv2");
agv2.setEnergyLevel("100");
agv2.setState("EXECUTING");
agv_map.put("agv2", agv2);
// agv1.setName("agv1");
// agv1.setEnergyLevel("70");
// agv1.setState("IDLE");
// agv_map.put("agv1", agv1);
//
// AgvDto agv2 = new AgvDto();
// agv2.setName("agv2");
// agv2.setEnergyLevel("100");
// agv2.setState("EXECUTING");
// agv_map.put("agv2", agv2);
JSONArray agv_rows = new JSONArray();
int i = 1;