Merge remote-tracking branch 'origin/dev' into dev

mes/src/main/java/com/ximai/mes/constant/ItemTypeEnum.java

+package com.ximai.mes.constant;
+
+/**
+ * 物料类型
+ */
+
+public enum ItemTypeEnum {
+
+    /**
+     * 成品
+     */
+    FINAL(301L),
+    /**
+     * 半成品
+     */
+    SF(201L);
+
+    private final Long id;
+
+    ItemTypeEnum(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+}

mes/src/main/java/com/ximai/mes/remote/process/FinishStockInCreateProcess.java

 package com.ximai.mes.remote.process;
 
 import com.ximai.mes.aspect.IExtendedProcess;
+import com.ximai.mes.constant.ItemTypeEnum;
 import com.ximai.mes.md.domain.MdItem;
 import com.ximai.mes.md.mapper.MdItemMapper;
 import com.ximai.mes.pro.domain.proWorkOrder.ProWorkorder;
@@ -16,6 +17,7 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 @Component
 public class FinishStockInCreateProcess implements IExtendedProcess {
@@ -32,7 +34,7 @@ public class FinishStockInCreateProcess implements IExtendedProcess {
         BigDecimal qualifyQuantity = (BigDecimal)args[1];
         String requestCode = autoCodeUtil.genSerialCode("ERP_FINISH_STOCK_IN","");
         MdItem item = mdItemMapper.selectById(workorder.getProductId());
-        if(101L!=item.getItemTypeId()){
+        if(!Objects.equals(ItemTypeEnum.FINAL.getId(), item.getItemTypeId())){
             FinishStockInCreate create = new FinishStockInCreate();
             create.setStockInNo(requestCode);
             List<FinishStockInCreateDetail> details = new ArrayList<>();