From 6855a36b5724c8531e1d81318e8b7dccb26c3853 Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Sun, 10 Jul 2022 16:50:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HaiLiangFeedingTrunkDeviceDriver.java     |   1 +
 .../rest/ProduceshiftorderController.java     |  17 +++
 .../ProduceshiftorderdetailController.java    |  10 +-
 .../service/ProduceshiftorderService.java     |  19 +++
 .../ProduceshiftorderdetailService.java       |   8 ++
 .../dto/ProduceshiftorderdetailDto.java       |   7 +
 .../impl/ProduceshiftorderServiceImpl.java    | 123 +++++++++++++-----
 .../ProduceshiftorderdetailServiceImpl.java   |  41 ++++--
 .../org/nl/acs/order/service/impl/Test.java   |   2 +-
 .../org/nl/acs/order/service/wql/order.xls    | Bin 200704 -> 200704 bytes
 .../run/LetteringSocketConnectionAutoRun.java |  20 +--
 qd/src/api/acs/order/order.js                 |  10 +-
 qd/src/views/acs/order/sorting/index.vue      |   4 +-
 13 files changed, 205 insertions(+), 57 deletions(-)

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 54fea88..c203135 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
@@ -483,6 +483,7 @@ public class HaiLiangFeedingTrunkDeviceDriver extends AbstractOpcDeviceDriver im
         last_lettering_frequency = lettering_frequency;
         last_one_speed = one_speed;
         last_coating_frequency = coating_frequency;
+        last_order_feeding_finish = order_feeding_finish;
     }
 
 
diff --git a/nladmin-system/src/main/java/org/nl/acs/order/rest/ProduceshiftorderController.java b/nladmin-system/src/main/java/org/nl/acs/order/rest/ProduceshiftorderController.java
index 06122be..43a6f57 100644
--- a/nladmin-system/src/main/java/org/nl/acs/order/rest/ProduceshiftorderController.java
+++ b/nladmin-system/src/main/java/org/nl/acs/order/rest/ProduceshiftorderController.java
@@ -49,6 +49,8 @@ public class ProduceshiftorderController {
         return new ResponseEntity<>(produceshiftorderService.queryAll(whereJson, page), HttpStatus.OK);
     }
 
+
+
     @GetMapping(value = "/querySorting")
     @Log("查询分拣工单")
     @ApiOperation("查询分拣工单")
@@ -173,6 +175,14 @@ public class ProduceshiftorderController {
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
+    @Log("工单明细手动完成")
+    @ApiOperation("工单明细手动完成")
+    @PostMapping(value = "/manual_finish")
+    public ResponseEntity<Object> manual_finish(@Validated @RequestBody Map whereJson) {
+        produceshiftorderService.manual_finish(whereJson);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
     @Log("工单强制完成")
     @ApiOperation("工单强制完成")
     @PostMapping(value = "/order_force_complete")
@@ -236,6 +246,13 @@ public class ProduceshiftorderController {
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
+    @Log("查询缓存所有工单")
+    @ApiOperation("查询缓存所有工单")
+    @PostMapping(value = "/findAllOrderFromCache")
+    public ResponseEntity<Object> findAllOrderFromCache() {
+        return new ResponseEntity<>(produceshiftorderService.findAllOrderFromCache(), HttpStatus.OK);
+    }
+
 
 
 }
diff --git a/nladmin-system/src/main/java/org/nl/acs/order/rest/ProduceshiftorderdetailController.java b/nladmin-system/src/main/java/org/nl/acs/order/rest/ProduceshiftorderdetailController.java
index 4a13bf1..df9b2ce 100644
--- a/nladmin-system/src/main/java/org/nl/acs/order/rest/ProduceshiftorderdetailController.java
+++ b/nladmin-system/src/main/java/org/nl/acs/order/rest/ProduceshiftorderdetailController.java
@@ -24,7 +24,7 @@ import lombok.extern.slf4j.Slf4j;
  **/
 @RestController
 @RequiredArgsConstructor
-@Api(tags = "order管理")
+@Api(tags = "工单明细管理")
 @RequestMapping("/api/produceshiftorderdetail")
 @Slf4j
 public class ProduceshiftorderdetailController {
@@ -73,4 +73,12 @@ public class ProduceshiftorderdetailController {
     public void download(HttpServletResponse response, @RequestParam Map whereJson) throws IOException {
         produceshiftorderdetailService.download(produceshiftorderdetailService.queryAll(whereJson), response);
     }
+
+    @Log("查询缓存所有工单明细")
+    @ApiOperation("查询缓存所有工单明细")
+    @PostMapping(value = "/findAllOrderDetailFromCache")
+    public ResponseEntity<Object> findAllOrderFromCache() {
+        return new ResponseEntity<>(produceshiftorderdetailService.findAllOrderDetailFromCache(), HttpStatus.OK);
+    }
+
 }
diff --git a/nladmin-system/src/main/java/org/nl/acs/order/service/ProduceshiftorderService.java b/nladmin-system/src/main/java/org/nl/acs/order/service/ProduceshiftorderService.java
index 915081f..54c4ef7 100644
--- a/nladmin-system/src/main/java/org/nl/acs/order/service/ProduceshiftorderService.java
+++ b/nladmin-system/src/main/java/org/nl/acs/order/service/ProduceshiftorderService.java
@@ -3,7 +3,9 @@ package org.nl.acs.order.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import org.nl.acs.instruction.service.dto.Instruction;
 import org.nl.acs.order.service.dto.ProduceshiftorderDto;
+import org.nl.acs.order.service.dto.ProduceshiftorderdetailDto;
 import org.springframework.data.domain.Pageable;
 
 import javax.servlet.http.HttpServletResponse;
@@ -174,12 +176,19 @@ public interface ProduceshiftorderService {
      */
     void detail_pause(Map whereJson);
 
+
     /**
      * 工单强制完成
      *
      */
     void order_force_complete(Map whereJson);
 
+    /**
+     * 工单明细手动完成
+     *
+     */
+    void manual_finish(Map whereJson);
+
 
     /**
      * 工单明细强制完成
@@ -242,4 +251,14 @@ public interface ProduceshiftorderService {
      * @param whereJson
      */
     Boolean print(JSONObject whereJson);
+
+
+    /**
+     *
+     * @return
+     */
+    List<ProduceshiftorderDto> findAllOrderFromCache();
+
+
+
 }
diff --git a/nladmin-system/src/main/java/org/nl/acs/order/service/ProduceshiftorderdetailService.java b/nladmin-system/src/main/java/org/nl/acs/order/service/ProduceshiftorderdetailService.java
index bfed442..ed8e456 100644
--- a/nladmin-system/src/main/java/org/nl/acs/order/service/ProduceshiftorderdetailService.java
+++ b/nladmin-system/src/main/java/org/nl/acs/order/service/ProduceshiftorderdetailService.java
@@ -88,4 +88,12 @@ public interface ProduceshiftorderdetailService {
 
     void reload();
 
+    /**
+     *
+     * @return
+     */
+    List<ProduceshiftorderdetailDto> findAllOrderDetailFromCache();
+
+    void upodateDetailStatus(String order_code,String status);
+
 }
diff --git a/nladmin-system/src/main/java/org/nl/acs/order/service/dto/ProduceshiftorderdetailDto.java b/nladmin-system/src/main/java/org/nl/acs/order/service/dto/ProduceshiftorderdetailDto.java
index 82135aa..ea95630 100644
--- a/nladmin-system/src/main/java/org/nl/acs/order/service/dto/ProduceshiftorderdetailDto.java
+++ b/nladmin-system/src/main/java/org/nl/acs/order/service/dto/ProduceshiftorderdetailDto.java
@@ -88,6 +88,13 @@ public class ProduceshiftorderdetailDto implements Serializable {
     private String length;
 
     /** 工单明细状态 */
+    /**
+     *
+     00-就绪、01-分拣中
+     02-下发工单明细暂停 03-工单明细暂停
+     04-下发强制完成 05-强制完成
+     06-自动完成 07-取消
+     */
     private String order_detail_status;
 
     /** 上料数量 */
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 de626da..bf847f8 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
@@ -11,7 +11,10 @@ import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.spire.xls.CellRange;
+import com.spire.xls.PageSetup;
 import com.spire.xls.Workbook;
+import com.spire.xls.Worksheet;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.acs.device_driver.hailiang.hailiang_feeding_trunk.HaiLiangFeedingTrunkDeviceDriver;
@@ -37,10 +40,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletResponse;
-import java.awt.print.PageFormat;
-import java.awt.print.Paper;
-import java.awt.print.PrinterException;
-import java.awt.print.PrinterJob;
+import java.awt.print.*;
 import java.io.IOException;
 import java.util.*;
 
@@ -71,7 +71,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
     }
 
     public synchronized void reload() {
-        this.order = this.queryAllOrder("(order_status !='07' and order_status !='08' and order_status !='09') and is_deleted =0");
+        order = this.queryAllOrder("(order_status !='07' and order_status !='08' and order_status !='09') and is_deleted =0");
         produceshiftorderdetailService.reload();
     }
 
@@ -335,6 +335,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
         if (!StrUtil.equals(dto.getOrder_id(), "07") && !StrUtil.equals(dto.getOrder_id(), "08") && !StrUtil.equals(dto.getOrder_id(), "09")) {
             order.add(dto);
         }
+        produceshiftorderdetailService.reload();
     }
 
     @Override
@@ -485,9 +486,23 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
         WQLObject wo = WQLObject.getWQLObject("acs_produceshiftorder");
         JSONObject json= (JSONObject) JSONObject.toJSON(entity);
         wo.update(json);
-        HashMap<String, String> map = new HashMap<>();
-        map.put("order_detail_status","07");
-        WQLObject.getWQLObject("acs_produceshiftorderdetail").update(map,"order_id = '"+ id + "'");
+//        HashMap<String, String> map = new HashMap<>();
+//        map.put("order_detail_status","07");
+//        WQLObject.getWQLObject("acs_produceshiftorderdetail").update(map,"order_id = '"+ id + "'");
+
+        produceshiftorderdetailService.upodateDetailStatus(entity.getOrder_code(),"05");
+        Iterator<ProduceshiftorderDto> iterator = order.iterator();
+        while (iterator.hasNext()) {
+            ProduceshiftorderDto produceshiftorderDto = iterator.next();
+            if (produceshiftorderDto.getOrder_id().equals(entity.getOrder_id())) {
+                iterator.remove();
+            }
+        }
+        if (!StrUtil.equals(entity.getOrder_id(), "07") && !StrUtil.equals(entity.getOrder_id(), "08") && !StrUtil.equals(entity.getOrder_id(), "09")) {
+            order.add(entity);
+        }
+
+        produceshiftorderdetailService.reload();
 
     }
 
@@ -551,12 +566,6 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
         List<HaiLiangFeedingTrunkDeviceDriver> deviceAll = deviceAppService.findDeviceDriver(HaiLiangFeedingTrunkDeviceDriver.class);
         if (deviceAll.get(0) instanceof HaiLiangFeedingTrunkDeviceDriver) {
             haiLiangFeedingTrunkDeviceDriver = (HaiLiangFeedingTrunkDeviceDriver) deviceAll.get(0);
-            if(haiLiangFeedingTrunkDeviceDriver.getMode() !=2){
-                throw new BadRequestException("设备未联机,无法下发恢复!");
-            }
-            if(haiLiangFeedingTrunkDeviceDriver.getPause() == 0 ){
-                throw new BadRequestException("设备已处于恢复状态,无法下发恢复!");
-            }
             haiLiangFeedingTrunkDeviceDriver.writing("to_pause","0");
         }
     }
@@ -568,10 +577,6 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
         List<HaiLiangFeedingTrunkDeviceDriver> deviceAll = deviceAppService.findDeviceDriver(HaiLiangFeedingTrunkDeviceDriver.class);
         if (deviceAll.get(0) instanceof HaiLiangFeedingTrunkDeviceDriver) {
             haiLiangFeedingTrunkDeviceDriver = (HaiLiangFeedingTrunkDeviceDriver) deviceAll.get(0);
-            if(haiLiangFeedingTrunkDeviceDriver.getMode() !=2){
-                throw new BadRequestException("设备未联机,无法下发恢复!");
-            }
-
             haiLiangFeedingTrunkDeviceDriver.writing("to_pause","1");
         }
     }
@@ -601,6 +606,9 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
             throw new BadRequestException("未找到对应工单明细!");
 
         }
+        if(ObjectUtil.isEmpty(dto)){
+            throw new BadRequestException("未找到对应工单!");
+        }
         // 2.根据明细template_id 找到对应的模板
         JSONObject jsonStor = WQL.getWO("QPRODUCESHIFTORDER").addParam("flag", "3").addParam("storage_id", detaildto.getTemplate_id()).process().uniqueResult(0);
 
@@ -636,8 +644,9 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
         jo.put("inspector",detaildto.getInspector());
         jo.put("mg_weight",detaildto.getMg_weight());
         //打印纸张大小
-        jo.put("page_length","50");
-        jo.put("page_height","40");
+        //1cm = 118px
+        jo.put("page_length",590);
+        jo.put("page_height",472);
         print(jo);
     }
 
@@ -753,6 +762,22 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
     }
 
 
+
+    @Override
+    public void manual_finish(Map whereJson) {
+        String order = whereJson.get("parent_order_code").toString();
+        String detail = whereJson.get("order_code").toString();
+        ProduceshiftorderdetailDto detaildto = produceshiftorderdetailService.findOrderDetailFromCache(order,detail);
+        if(ObjectUtil.isEmpty(detaildto)){
+            throw new BadRequestException("未找到对应工单明细!");
+        }
+        detaildto.setOrder_detail_status("05");
+        HaiLiangFeedingTrunkDeviceDriver haiLiangFeedingTrunkDeviceDriver;
+        List<HaiLiangFeedingTrunkDeviceDriver> deviceAll = deviceAppService.findDeviceDriver(HaiLiangFeedingTrunkDeviceDriver.class);
+
+        produceshiftorderdetailService.update(detaildto);
+    }
+
     @Override
     public void download(List<ProduceshiftorderDto> dtos, HttpServletResponse response) throws IOException {
         List<Map<String, Object>> list = new ArrayList<>();
@@ -863,7 +888,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
     @Override
     public List<ProduceshiftorderDto> findOrderByOrderStatusFromCache(String order_status) {
         List<ProduceshiftorderDto> list = new ArrayList<ProduceshiftorderDto>();
-        Iterator var3 = order.iterator();
+        Iterator var3 = this.order.iterator();
         while (var3.hasNext()) {
             ProduceshiftorderDto oneorder = (ProduceshiftorderDto) var3.next();
             if (StrUtil.equals(oneorder.getOrder_status(), order_status)) {
@@ -1009,23 +1034,44 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
         workBook.fill(map, sheet);
         workBook.finish();
 
-        // 5.打印
-        Workbook workbook = new Workbook();
-        workbook.loadFromFile(pathName);
-        //创建 PrinterJob对象
-        PrinterJob printerJob = PrinterJob.getPrinterJob();
-        //指定打印页面为默认大小和方向
-        PageFormat pageFormat = printerJob.defaultPage();
-        //设置相关打印选项
-        Paper paper = pageFormat.getPaper();
-        paper.setSize(whereJson.getInteger("page_length"),whereJson.getInteger("page_height"));
-        paper.setImageableArea(0, 0, whereJson.getInteger("page_length"),whereJson.getInteger("page_height"));
-        pageFormat.setPaper(paper);
-        printerJob.setCopies(1);
-        printerJob.setPrintable(workbook, pageFormat);
+        Book book=new Book();
+        Workbook loDoc = new Workbook();
+        loDoc.loadFromFile(pathName);
+        Worksheet worksheet = loDoc.getWorksheets().get(0);
+        PageSetup pageSetup = worksheet.getPageSetup();
+        String printArea="A2:B8";
+        pageSetup.setPrintArea(printArea);
+        pageSetup.setLeftMargin(0);
+        pageSetup.setRightMargin(0);
+        pageSetup.setTopMargin(0);
+        pageSetup.setBottomMargin(0);
+        CellRange cellRanges = worksheet.getCellRange(printArea);
+        int height=0;
+        for (CellRange row : cellRanges.getRows()) {
+            height+=  worksheet.getRowHeightPixels(row.getRow());
+        }
+
+        int width=0;
+        for (CellRange column : cellRanges.getColumns()) {
+            width+=worksheet.getColumnWidthPixels(column.getColumn());
+        }
+
+        PrinterJob loPrinterJob = PrinterJob.getPrinterJob();
+        PageFormat loPageFormat = loPrinterJob.defaultPage();
+        Paper loPaper = loPageFormat.getPaper();
+
+        loPaper.setImageableArea(0, 0, loPageFormat.getWidth(), loPageFormat.getHeight());
+
+        loPaper.setSize(142,113);
+//        loPaper.setSize(width/96.0*72,height/96.0*72);
+        loPageFormat.setPaper(loPaper);
+        loPrinterJob.setCopies(1);
+        loPrinterJob.setPrintable(loDoc, loPageFormat);
+        book.append(loDoc,loPageFormat);
+        loPrinterJob.setPageable(book);
         try {
             // 执行打印
-            printerJob.print();
+            loPrinterJob.print();
         } catch (PrinterException e) {
             e.printStackTrace();
             return false;
@@ -1033,4 +1079,9 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
         return true;
     }
 
+    @Override
+    public List<ProduceshiftorderDto> findAllOrderFromCache() {
+        return order;
+    }
+
 }
\ No newline at end of file
diff --git a/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderdetailServiceImpl.java b/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderdetailServiceImpl.java
index 77dab8c..f9ca9d9 100644
--- a/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderdetailServiceImpl.java
+++ b/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderdetailServiceImpl.java
@@ -121,8 +121,8 @@ public class ProduceshiftorderdetailServiceImpl implements Produceshiftorderdeta
                 iterator.remove();
             }
         }
-        if (!StrUtil.equals(dto.getOrder_detail_status(), "07") || !StrUtil.equals(dto.getOrder_detail_status(), "08")
-            ||!StrUtil.equals(dto.getOrder_detail_status(), "09")) {
+        if (!StrUtil.equals(dto.getOrder_detail_status(), "05") || !StrUtil.equals(dto.getOrder_detail_status(), "06")
+            ||!StrUtil.equals(dto.getOrder_detail_status(), "07")) {
             detail.add(dto);
         }
 
@@ -206,7 +206,25 @@ public class ProduceshiftorderdetailServiceImpl implements Produceshiftorderdeta
     }
 
     public synchronized void reload() {
-        this.detail = this.queryAllOrderDteail(" (order_detail_status != '05' and order_detail_status != '06' and order_detail_status != '07') and is_deleted =0 order by order_detail_code");
+        this.detail = this.queryAllOrderDteail(" (order_detail_status != '05' and and order_detail_status != '06' and order_detail_status != '07') and is_deleted =0 order by order_detail_code");
+    }
+
+    @Override
+    public void upodateDetailStatus(String order_code,String status){
+        WQLObject wo = WQLObject.getWQLObject("acs_produceshiftorderdetail");
+        JSONArray arr = wo.query("order_code = "+ order_code).getResultJSONArray(0);
+        List<ProduceshiftorderdetailDto> list = arr.toJavaList(ProduceshiftorderdetailDto.class);
+        for(int i=0;i<list.size();i++){
+            ProduceshiftorderdetailDto dto = list.get(i);
+            String currentUsername = SecurityUtils.getCurrentUsername();
+            String now = DateUtil.now();
+            dto.setUpdate_time(now);
+            dto.setUpdate_by(currentUsername);
+            dto.setOrder_detail_status(status);
+            JSONObject json = (JSONObject) JSONObject.toJSON(dto);
+            wo.update(json);
+        }
+        reload();
     }
 
     @Override
@@ -250,21 +268,22 @@ public class ProduceshiftorderdetailServiceImpl implements Produceshiftorderdeta
         String msg2 = dto.getLettering_message2();
         String icon = dto.getLettering_icon();
         if(StrUtil.equals(icon,"1")){
-            icon = "<";
+            icon = "<<";
         } else if (StrUtil.equals(icon,"2"))  {
             icon = ">";
         } else {
             icon = "";
         }
-        message = msg1 + icon + msg2;
+        message = msg1 + " " + icon +  " " + msg2;
         //清缓存
         try {
-//            LetteringSocketConnectionAutoRun.write("BUFFERCLEAR" + "\r\n");
             String yh = "\"";
-            String strInst = "SETTEXT " + "S1" + " " + yh + message + yh + "\r\n";  //2个变量
-            LetteringSocketConnectionAutoRun.write(strInst + "\r\n");
+
+            String strInst = "SETTEXT " + " S1 " + " " + yh + message + yh +"\r\n";  //2个变量
+            LetteringSocketConnectionAutoRun.write(strInst);
 
         } catch (Exception e) {
+            e.printStackTrace();
             return  false;
         }
         return true;
@@ -320,4 +339,10 @@ public class ProduceshiftorderdetailServiceImpl implements Produceshiftorderdeta
             return true;
         }
     }
+
+
+    @Override
+    public List<ProduceshiftorderdetailDto> findAllOrderDetailFromCache() {
+        return detail;
+    }
 }
diff --git a/nladmin-system/src/main/java/org/nl/acs/order/service/impl/Test.java b/nladmin-system/src/main/java/org/nl/acs/order/service/impl/Test.java
index cc4d945..ff4657b 100644
--- a/nladmin-system/src/main/java/org/nl/acs/order/service/impl/Test.java
+++ b/nladmin-system/src/main/java/org/nl/acs/order/service/impl/Test.java
@@ -5,7 +5,7 @@ public class Test {
     public static void main(String[] args) {
 
         Process printProcess;
-        String printName ="Zebra ZE500-4 RH (300 dpi)";
+        String printName ="PDF24";
         try
         {
             printProcess = Runtime
diff --git a/nladmin-system/src/main/java/org/nl/acs/order/service/wql/order.xls b/nladmin-system/src/main/java/org/nl/acs/order/service/wql/order.xls
index 6f8f1ead7eb1751f800293564eab1e4ffae3d169..5bf003f355598ced21c9a38643e1616f7c450c51 100644
GIT binary patch
delta 5721
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

delta 5664
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
Q_=@B?YSw&)mMBC0e`=g&WB>pF

diff --git a/nladmin-system/src/main/java/org/nl/start/auto/run/LetteringSocketConnectionAutoRun.java b/nladmin-system/src/main/java/org/nl/start/auto/run/LetteringSocketConnectionAutoRun.java
index ea0c5c0..4b2ab0a 100644
--- a/nladmin-system/src/main/java/org/nl/start/auto/run/LetteringSocketConnectionAutoRun.java
+++ b/nladmin-system/src/main/java/org/nl/start/auto/run/LetteringSocketConnectionAutoRun.java
@@ -18,6 +18,7 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
 import java.net.Socket;
 import java.util.Date;
 import java.util.List;
@@ -36,6 +37,7 @@ public class LetteringSocketConnectionAutoRun extends AbstractAutoRunnable {
     boolean bConnected = true;
     @Autowired
     DeviceAppService deviceAppService;
+
     public LetteringSocketConnectionAutoRun() {
         this.recordTime = new Date((new Date()).getTime() - (long) this.recordTimeOut);
     }
@@ -78,7 +80,7 @@ public class LetteringSocketConnectionAutoRun extends AbstractAutoRunnable {
 //
 //            }
 //            if (StrUtil.equals(bs.toString(), "OK")) {
-            if(bs.toString().contains("OK")){
+            if (bs.toString().contains("OK")) {
                 HaiLiangFeedingTrunkDeviceDriver haiLiangFeedingTrunkDeviceDriver;
                 List<HaiLiangFeedingTrunkDeviceDriver> deviceAll = deviceAppService.findDeviceDriver(HaiLiangFeedingTrunkDeviceDriver.class);
                 if (deviceAll.get(0) instanceof HaiLiangFeedingTrunkDeviceDriver) {
@@ -91,7 +93,8 @@ public class LetteringSocketConnectionAutoRun extends AbstractAutoRunnable {
 
     public static void write(String str) throws IOException {
         System.out.println(str);
-        dos.write(hexStringToByte(bytesToHexString(stringToByte(str))));
+//        dos.write(hexStringToByte(bytesToHexString(stringToByte(str))));
+        dos.write(str.getBytes("UTF-8"));
     }
 
     public static byte[] stringToByte(String str) {
@@ -101,12 +104,14 @@ public class LetteringSocketConnectionAutoRun extends AbstractAutoRunnable {
 
     public static String bytesToHexString(byte[] src) {
         StringBuilder builder = new StringBuilder();
+        Byte[] bytes = new Byte[src.length];
         for (int i = 0; i < src.length; i++) {
             int v = src[i] & 0xff;
             String hv = Integer.toHexString(v);
             if (hv.length() < 2) {
                 builder.append(0);
             }
+            bytes[i] = Byte.parseByte(hv);
             builder.append(hv);
         }
         return builder.toString().toUpperCase();
@@ -150,10 +155,9 @@ public class LetteringSocketConnectionAutoRun extends AbstractAutoRunnable {
 
 
     public static void main(String[] args) throws UnsupportedEncodingException {
-        JSONObject jo = new JSONObject();
-        jo.put("x",10.0);
-        jo.put("y",3.0);
-        jo.put("angle",0);
-        System.out.println(bytesToHexString(stringToByte(jo.toString())));
+        String write = "SETTEXT S1 '111 > 222'" + "\r\n";
+//        System.out.println(hexStringToByte(bytesToHexString(stringToByte(jo))));
+//        System.out.println(bytesToHexString(stringToByte(jo.toString())));
+
     }
-}
+}
\ No newline at end of file
diff --git a/qd/src/api/acs/order/order.js b/qd/src/api/acs/order/order.js
index a672ec9..0cbd50b 100644
--- a/qd/src/api/acs/order/order.js
+++ b/qd/src/api/acs/order/order.js
@@ -143,5 +143,13 @@ export function reload() {
   })
 }
 
+export function manual_finish(data) {
+  return request({
+    url: 'api/produceshiftorder/manual_finish',
+    method: 'post',
+    data
+  })
+}
+
 export default { add, edit, del, importExcel, getDtl, send, device_pause, device_restore, clear, stop, order_pause, order_force_complete, detail_pause, detail_force_complete,
-  selectTemplateList, selectColortypeList, reload, send_letteringMess, send_labelingMess }
+  selectTemplateList, selectColortypeList, reload, send_letteringMess, send_labelingMess, manual_finish }
diff --git a/qd/src/views/acs/order/sorting/index.vue b/qd/src/views/acs/order/sorting/index.vue
index 7eda9bf..b5cf4be 100644
--- a/qd/src/views/acs/order/sorting/index.vue
+++ b/qd/src/views/acs/order/sorting/index.vue
@@ -174,7 +174,7 @@
           <template slot-scope="scope">
 <!--            <el-button v-if="scope.row.is_flag ==='1'" type="text" size="small" @click="handleClick(scope.row,'1')">暂停工单</el-button>-->
             <el-button v-if="scope.row.is_flag ==='1'" type="text" size="small" @click="handleClick(scope.row,'2')">强制完成工单</el-button>
-<!--            <el-button v-if="scope.row.is_flag ==='0'" type="text" size="small" @click="handleClick(scope.row,'3')">暂停明细</el-button>-->
+            <el-button v-if="scope.row.is_flag ==='0'" type="text" size="small" @click="handleClick(scope.row,'3')">手动完成</el-button>
             <el-button v-if="scope.row.is_flag ==='0'" type="text" size="small" @click="handleClick(scope.row,'4')">强制完成明细</el-button>
           </template>
         </el-table-column>
@@ -309,7 +309,7 @@ export default {
         }
       } else {
         if (flag === '3') {
-          crudProduceshiftorder.detail_pause(row).then(res => {
+          crudProduceshiftorder.manual_finish(row).then(res => {
             this.crud.toQuery()
             this.crud.notify(status + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
           }).catch(err => {