diff --git a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/HaiLiangFeedingTrunkDeviceDriver.java b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/HaiLiangFeedingTrunkDeviceDriver.java index f43280a..4949d22 100644 --- a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/HaiLiangFeedingTrunkDeviceDriver.java +++ b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/HaiLiangFeedingTrunkDeviceDriver.java @@ -401,7 +401,7 @@ public class HaiLiangFeedingTrunkDeviceDriver extends AbstractOpcDeviceDriver im update_labeling_detail(String.valueOf(order),String.valueOf(labeling_order_detail)); } - //捆扎明细更新 + //裹膜、捆扎明细更新 if(order >0 && strapping_order_detail>0){ update_strapping_detail(String.valueOf(order),String.valueOf(strapping_order_detail)); } @@ -493,6 +493,7 @@ public class HaiLiangFeedingTrunkDeviceDriver extends AbstractOpcDeviceDriver im last_coating_frequency = coating_frequency; last_order_feeding_finish = order_feeding_finish; last_detail_coating_qualified_qty = detail_coating_qualified_qty; + last_strapping_order_detail = strapping_order_detail; } diff --git a/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java b/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java index caac2c7..40246c0 100644 --- a/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java @@ -15,6 +15,7 @@ import org.nl.acs.config.AcsConfig; import org.nl.acs.config.server.AcsConfigService; import org.nl.acs.device_driver.hailiang.hailiang_feeding_trunk.HaiLiangFeedingTrunkDeviceDriver; import org.nl.acs.device_driver.hailiang.hailiang_labeling.HaiLiangLabelingDeviceDriver; +import org.nl.acs.log.service.LogServer; import org.nl.acs.opc.DeviceAppService; import org.nl.acs.order.service.ProduceshiftorderService; import org.nl.acs.order.service.ProduceshiftorderdetailService; @@ -25,6 +26,7 @@ import org.nl.modules.system.util.CodeUtil; import org.nl.start.auto.initial.ApplicationAutoInitial; import org.nl.utils.FileUtil; import org.nl.utils.SecurityUtils; +import org.nl.utils.SpringContextHolder; import org.nl.wql.WQL; import org.nl.wql.core.bean.ResultBean; import org.nl.wql.core.bean.WQLObject; @@ -63,6 +65,10 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A @Autowired AcsConfigService acsConfigService; + + @Autowired + LogServer logServer; + @Override public void autoInitial() throws Exception { this.reload(); @@ -1026,12 +1032,13 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A "alloy="+ alloy ,"temper="+temper,"size="+material_spec,"pcs="+number,"outer_diameter="+outer_diameter, "standard="+standard, "batch="+batch,"prod_date="+prod_date,"present_strap_pack_number="+present_strap_pack_number, "inspector="+inspector,"mg_weight="+mg_weight}); + logServer.deviceLogToacs("TBXT","","","下发打印信息成功"); + } catch (Exception e) { e.printStackTrace(); - System.out.println("aaa"); - + logServer.deviceLogToacs("TBXT","","","下发打印信息异常:"+e.getMessage()); } return true; }