Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz

common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java

@@ -19,6 +19,9 @@ public class LabelPrintDto implements Serializable {
     //原材料标签参数
     //物料编码
     private String item;
+
+    private String itemNumber;
+
     //物料描述
     private String itemDescription;
     //供应商
@@ -45,6 +48,14 @@ public class LabelPrintDto implements Serializable {
     //打印张数
     private Integer printNum;
 
+    public String getItemNumber() {
+        return itemNumber;
+    }
+
+    public void setItemNumber(String itemNumber) {
+        this.itemNumber = itemNumber;
+    }
+
     public String getShopOrder() {
         return shopOrder;
     }

common/src/main/java/com/foreverwin/mesnac/common/service/impl/PrintLogServiceImpl.java

@@ -77,6 +77,7 @@ public class PrintLogServiceImpl extends ServiceImpl<PrintLogMapper, PrintLog> i
             list.get(i).setPrintNum(printList.get(i).getPrintNum());
         }
 
+        // 访问打印服务
         printServer(list);
 
         // 更新打印记录：是否已打印、使用的打印机、打印次数
@@ -115,10 +116,14 @@ public class PrintLogServiceImpl extends ServiceImpl<PrintLogMapper, PrintLog> i
     public void sfcLabelPrint(Map<String,Object> map) {
         Integer qty = (Integer) map.get("qty");
         List<LabelPrintDto> labelPrintDtoList = (List<LabelPrintDto>) map.get("labelPrintDtoList");
-        printServer(labelPrintDtoList);
+
         // 解决无法获取list中对象的问题
         String parse = JSON.toJSONString(labelPrintDtoList);
         List<LabelPrintDto> labelPrintDtos = JSONObject.parseArray(parse, LabelPrintDto.class);
+
+        // 访问打印服务
+        printServer(labelPrintDtos);
+
         // 打印张数
         Integer printNum = 0;
         for (LabelPrintDto labelP:labelPrintDtos) {

common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java

@@ -474,7 +474,9 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
             String drawingRevision = customFieldsService.getCustomFieldsValue(sfcServiceById.getItemBo(), CustomFieldConstant.ITEM_DRAWING_REVISION);
             labelPrintDto.setDrawingVersion(drawingRevision);
             labelPrintDto.setQty(new BigDecimal(sfcServiceById.getQty()));
-            String workOrder = customFieldsService.getCustomFieldsValue(sfcServiceById.getShopOrderBo(), "WORK_ORDER");
+            String workOrder = customFieldsService.getCustomFieldsValue(sfcServiceById.getShopOrderBo(), CustomFieldConstant.SO_WORK_ORDER);
+            String itemNumber = customFieldsService.getCustomFieldsValue(sfcServiceById.getShopOrderBo(), CustomFieldConstant.SO_ITEM_NUMBER);
+            labelPrintDto.setItemNumber(itemNumber);
             labelPrintDto.setWorkOrder(workOrder);
             labelPrintDto.setBlankingSize(sfcDispatchDto.getBlankingSize());
             //下道工序