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

更新

Browse Source
This commit is contained in:
gengby
2022-06-28 16:09:46 +08:00
parent ab55b63245
commit b2180dfc5d
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wcs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
View File

@@ -941,6 +941,8 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
if (hailiangEngravingCacheDeviceDriver.getMove() != Integer.parseInt(hasGoodStatus)){
hailiangEngravingCacheDeviceDriver.writing("to_cache_write",hasGoodStatus);
}
hailiangEngravingCacheDeviceDriver.setHasGoods(Integer.parseInt(hasGoodStatus));
device.setHas_goods(Integer.parseInt(hasGoodStatus));
device.setMaterial_type(material_type);
hailiangEngravingCacheDeviceDriver.setMaterial(material_type);
JSONObject updatejson = (JSONObject) JSONObject.toJSON(obj);

10
wcs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
View File

@@ -17,6 +17,7 @@ import org.nl.acs.config.AcsConfig;
import org.nl.acs.config.server.AcsConfigService;
import org.nl.acs.device.service.DeviceService;
import org.nl.acs.device.service.impl.DeviceServiceImpl;
import org.nl.acs.device_driver.basedriver.hailiang_one.hailiang_engraving_machine.HailiangEngravingMachineDeviceDriver;
import org.nl.acs.device_driver.basedriver.lamp_three_color.LampThreecolorDeviceDriver;
import org.nl.acs.device_driver.basedriver.standard_conveyor_control.StandardCoveyorControlDeviceDriver;
import org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_plcscanner.StandardCoveyorControlWithPlcScannerDeviceDriver;
@@ -742,10 +743,13 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
JSONObject jo1 = new JSONObject();
jo1.put("device_code", instnextdevice);
if (StrUtil.equals(entity.getMaterial(), "1")) {
jo1.put("hasGoodStatus", "1");
} else {
String start_point_code = entity.getStart_point_code();
Device deviceByCode = deviceAppService.findDeviceByCode(start_point_code);
if(deviceByCode.getDeviceDriver() instanceof HailiangEngravingMachineDeviceDriver){
jo1.put("hasGoodStatus", "2");
} else {
jo1.put("hasGoodStatus", "1");
}
jo1.put("material_type", startdevice.getMaterial_type());
jo1.put("quantity", startdevice.getQuantity());