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 c203135..7259071 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 @@ -668,13 +668,16 @@ public class HaiLiangFeedingTrunkDeviceDriver extends AbstractOpcDeviceDriver im String is_coating = orderdto.getIs_coating(); //是否贴标 String is_labeling = orderdto.getIs_labeling(); - //下发激光刻字信息 - //判断下发刻字成功 - if(!send_letter_flag){ - send_letter_flag = produceshiftorderdetailService.sendLetteringMess(dto); - logServer.deviceLogToacs(this.device_code,"","","下发激光刻字信息结果:"+send_letter_flag); + + if("1".equals(is_lettering)){ + //下发激光刻字信息 + //判断下发刻字成功 + if(!send_letter_flag){ + send_letter_flag = produceshiftorderdetailService.sendLetteringMess(dto); + logServer.deviceLogToacs(this.device_code,"","","下发激光刻字信息结果:"+send_letter_flag); + } } - if(send_letter_flag_back) { + if(send_letter_flag_back || "0".equals(is_lettering)) { logServer.deviceLogToacs(this.device_code,"","","申请工单明细成功,order:"+order+",orderdetail:"+orderDetail); if(last_detail){ writing(ItemProtocol.item_to_is_last,"1");