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

更新

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2022-08-19 10:54:57 +08:00
parent e5ff5f5b64
commit 3a51cf0af1
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/HaiLiangFeedingTrunkDeviceDriver.java
View File

@@ -401,7 +401,7 @@ public class HaiLiangFeedingTrunkDeviceDriver extends AbstractOpcDeviceDriver im
update_labeling_detail(String.valueOf(order),String.valueOf(labeling_order_detail)); update_labeling_detail(String.valueOf(order),String.valueOf(labeling_order_detail));
} }
//捆扎明细更新 //裹膜、捆扎明细更新
if(order >0 && strapping_order_detail>0){ if(order >0 && strapping_order_detail>0){
update_strapping_detail(String.valueOf(order),String.valueOf(strapping_order_detail)); 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_coating_frequency = coating_frequency;
last_order_feeding_finish = order_feeding_finish; last_order_feeding_finish = order_feeding_finish;
last_detail_coating_qualified_qty = detail_coating_qualified_qty; last_detail_coating_qualified_qty = detail_coating_qualified_qty;
last_strapping_order_detail = strapping_order_detail;
} }

11
nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java
View File

@@ -15,6 +15,7 @@ import org.nl.acs.config.AcsConfig;
import org.nl.acs.config.server.AcsConfigService; 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_feeding_trunk.HaiLiangFeedingTrunkDeviceDriver;
import org.nl.acs.device_driver.hailiang.hailiang_labeling.HaiLiangLabelingDeviceDriver; 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.opc.DeviceAppService;
import org.nl.acs.order.service.ProduceshiftorderService; import org.nl.acs.order.service.ProduceshiftorderService;
import org.nl.acs.order.service.ProduceshiftorderdetailService; 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.start.auto.initial.ApplicationAutoInitial;
import org.nl.utils.FileUtil; import org.nl.utils.FileUtil;
import org.nl.utils.SecurityUtils; import org.nl.utils.SecurityUtils;
import org.nl.utils.SpringContextHolder;
import org.nl.wql.WQL; import org.nl.wql.WQL;
import org.nl.wql.core.bean.ResultBean; import org.nl.wql.core.bean.ResultBean;
import org.nl.wql.core.bean.WQLObject; import org.nl.wql.core.bean.WQLObject;
@@ -63,6 +65,10 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
@Autowired @Autowired
AcsConfigService acsConfigService; AcsConfigService acsConfigService;
@Autowired
LogServer logServer;
@Override @Override
public void autoInitial() throws Exception { public void autoInitial() throws Exception {
this.reload(); 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, "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, "standard="+standard, "batch="+batch,"prod_date="+prod_date,"present_strap_pack_number="+present_strap_pack_number,
"inspector="+inspector,"mg_weight="+mg_weight}); "inspector="+inspector,"mg_weight="+mg_weight});
logServer.deviceLogToacs("TBXT","","","下发打印信息成功");
} }
catch (Exception e) catch (Exception e)
{ {
e.printStackTrace(); e.printStackTrace();
System.out.println("aaa"); logServer.deviceLogToacs("TBXT","","","下发打印信息异常:"+e.getMessage());
} }
return true; return true;
} }