Merge remote-tracking branch 'origin/master'

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/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());
             //下道工序

quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java

@@ -212,6 +212,8 @@ public class InspectionTaskManageServiceImpl implements InspectionTaskManageServ
         newInspectionTask.setStatus(Constants.INSPECTION_TASK_STATUS_NEW);
         newInspectionTask.setResult(null);
         newInspectionTask.setComments(null);
+        newInspectionTask.setCreatedDateTime(dateTime);
+        newInspectionTask.setModifiedDateTime(dateTime);
         inspectionTaskService.save(newInspectionTask);
     }
 }