Merge branch 'master' into master_merge

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_weigh_conveyor/SiemensWeightConveyorDeviceDriver.java

@@ -839,6 +839,7 @@ public class SiemensWeightConveyorDeviceDriver extends AbstractOpcDeviceDriver i
                 }
                 //创建指令后修改任务状态
                 taskdto.setTask_status("1");
+                taskdto.setWeight(String.valueOf(this.weight));
                 taskserver.update(taskdto);
                 requireSucess = true;
                 String next_addr = nextdevice.getExtraValue().get("address").toString();