Browse Source

修改

master
张江玮 2 years ago
parent
commit
47f0f258d0
  1. 21
      hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java

21
hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java

@ -1162,6 +1162,27 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
standardInspectSiteDeviceDriver.setBatch(batch); standardInspectSiteDeviceDriver.setBatch(batch);
device.setMaterial_type(material_type); device.setMaterial_type(material_type);
device.setBatch(batch); device.setBatch(batch);
device.setModel(model);
device.setProcess(process);
device.setWeight(weight);
device.setQc_status(qc_status);
device.setDate(date);
device.setOperation_by(operation_by);
WQLObject runpointwo = WQLObject.getWQLObject("acs_device_runpoint");
JSONObject json = runpointwo.query("device_code ='" + device_code + "'").uniqueResult(0);
if (!ObjectUtil.isEmpty(json)) {
DeviceRunpointDto obj = (DeviceRunpointDto) JSONObject.toBean(json, DeviceRunpointDto.class);
obj.setMaterial_type(material_type);
obj.setBatch(batch);
obj.setModel(model);
obj.setProcess(process);
obj.setWeight(weight);
obj.setQc_status(qc_status);
obj.setDate(date);
obj.setOperation_by(operation_by);
JSONObject updatejson = JSONObject.fromObject(obj);
runpointwo.update(updatejson, "device_code = '" + device_code + "'");
}
} else if (device.getDeviceDriver() instanceof YkbkSpecialDeviceDriver) { } else if (device.getDeviceDriver() instanceof YkbkSpecialDeviceDriver) {
ykbkSpecialDeviceDriver = (YkbkSpecialDeviceDriver) device.getDeviceDriver(); ykbkSpecialDeviceDriver = (YkbkSpecialDeviceDriver) device.getDeviceDriver();
ykbkSpecialDeviceDriver.setMaterial(material_type); ykbkSpecialDeviceDriver.setMaterial(material_type);

Loading…
Cancel
Save