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-06-06 14:54:01 +08:00
parent fddef31d67
commit 64d013e183
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,8 +113,9 @@ public class HaiLiangFeedingTrunkDeviceDriver extends AbstractOpcDeviceDriver im
pause = this.itemProtocol.getPause(); pause = this.itemProtocol.getPause();
clear = this.itemProtocol.getClear(); clear = this.itemProtocol.getClear();
//当前工单上料数量
order_feeding_qty = this.itemProtocol.getOrder_feeding_qty();
//当前工单明细号上料数量 //当前工单明细号上料数量
order_feeding_qty = this.itemProtocol.getDetail_feeding_qty();
detail_feeding_qty = this.itemProtocol.getDetail_feeding_qty(); detail_feeding_qty = this.itemProtocol.getDetail_feeding_qty();
//当前工单明细号上料合格数量 //当前工单明细号上料合格数量
detail_feeding_qualified_qty = this.itemProtocol.getDetail_feeding_qualified_qty(); detail_feeding_qualified_qty = this.itemProtocol.getDetail_feeding_qualified_qty();
@@ -471,7 +472,7 @@ public class HaiLiangFeedingTrunkDeviceDriver extends AbstractOpcDeviceDriver im
//下发激光刻字信息 //下发激光刻字信息
//判断下发刻字成功 //判断下发刻字成功
if(!send_letter_flag){ if(!send_letter_flag){
send_letter_flag = produceshiftorderdetailService.sendLetteringMess(str); send_letter_flag = produceshiftorderdetailService.sendLetteringMess(dto);
logServer.deviceLogToacs(this.device_code,"","","下发激光刻字信息结果:"+send_letter_flag); logServer.deviceLogToacs(this.device_code,"","","下发激光刻字信息结果:"+send_letter_flag);
} }
if(send_letter_flag_back) { if(send_letter_flag_back) {

2
nladmin-system/src/main/java/org/nl/acs/order/service/ProduceshiftorderdetailService.java
View File

@@ -82,7 +82,7 @@ public interface ProduceshiftorderdetailService {
List<ProduceshiftorderdetailDto> findOrderDetailByOrderCodeFromCache(String order_code); List<ProduceshiftorderdetailDto> findOrderDetailByOrderCodeFromCache(String order_code);
Boolean sendLetteringMess(String message) throws IOException; Boolean sendLetteringMess(ProduceshiftorderdetailDto dto) throws IOException;
Boolean isLastOrderDetail(String order); Boolean isLastOrderDetail(String order);

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

@@ -59,11 +59,11 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
@Override @Override
public void autoInitial() throws Exception { public void autoInitial() throws Exception {
this.reload(); //this.reload();
} }
public synchronized void reload() { public synchronized void reload() {
this.order = this.queryAllOrder("(order_status !='04' or order_status !='05' ) and is_deleted =0"); this.order = this.queryAllOrder("(order_status !='07' or order_status !='08' ) and is_deleted =0");
} }
@Override @Override

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

@@ -243,7 +243,12 @@ public class ProduceshiftorderdetailServiceImpl implements Produceshiftorderdeta
} }
@Override @Override
public Boolean sendLetteringMess(String message) { public Boolean sendLetteringMess(ProduceshiftorderdetailDto dto) {
String message = "";
String msg1 = dto.getLettering_message();
String msg2 = dto.getLettering_message2();
String icon = dto.getLettering_icon();
//清缓存 //清缓存
try { try {
LetteringSocketConnectionAutoRun.write("BUFFERCLEAR" + "\r\n"); LetteringSocketConnectionAutoRun.write("BUFFERCLEAR" + "\r\n");