线体产品

op-modules/op-mes/src/main/java/com/op/mes/domain/MesLine.java

@@ -35,6 +35,7 @@ public class MesLine extends BaseEntity {
      * 线体名称
      */
     private String lineName;
+    private String sapCode;
 
     /**
      * 标准用人
@@ -84,6 +85,14 @@ public class MesLine extends BaseEntity {
     private BigDecimal standarXl;//标准效率
     private BigDecimal actXl;//实际效率
 
+    public String getSapCode() {
+        return sapCode;
+    }
+
+    public void setSapCode(String sapCode) {
+        this.sapCode = sapCode;
+    }
+
     public BigDecimal getHourEfficiency() {
         return hourEfficiency;
     }

op-modules/op-mes/src/main/java/com/op/mes/mapper/MesLineMapper.java

@@ -1,9 +1,11 @@
 package com.op.mes.mapper;
 
 import java.util.List;
+import java.util.Map;
 
 import com.op.mes.domain.MesLine;
 import com.op.mes.domain.MesLineProduct;
+import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -75,4 +77,6 @@ public interface MesLineMapper {
     int insertLineProduct(MesLine mesLine);
 
     void updateLineProduct(MesLine mesLine);
+    @MapKey("sapCode")
+    Map<String, MesLine> getEquMap();
 }

op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineServiceImpl.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
@@ -91,7 +92,8 @@ public class MesLineServiceImpl implements IMesLineService {
     @Override
     @DS("#header.poolName")
     public List<MesLine> selectMesLineList(MesLine mesLine) {
-        return mesLineMapper.selectMesLineList(mesLine);
+        List<MesLine> dtos =  mesLineMapper.selectMesLineList(mesLine);
+        return dtos;
     }
 
     /**
@@ -219,11 +221,17 @@ public class MesLineServiceImpl implements IMesLineService {
     @Transactional
     public AjaxResult importOrder(List<MesLine> mesLineList) {
 
+        Map<String,MesLine> equMap = mesLineMapper.getEquMap();
+
         for(MesLine mesLineProduct:mesLineList){
             String factoryCode = ServletUtils.getRequest().getHeader("PoolName").replace("ds_","");
             mesLineProduct.setFactoryCode(factoryCode);
             mesLineProduct.setCreateBy(SecurityUtils.getUsername());
             mesLineProduct.setCreateTime(DateUtils.getNowDate());
+            MesLine mesEqu = equMap.get(mesLineProduct.getLineCode());
+            if(mesEqu != null){
+                mesLineProduct.setLineCode(mesEqu.getLineCode());
+            }
         }
 
         // 数据校验

op-modules/op-mes/src/main/resources/mapper/mes/MesLineMapper.xml

@@ -227,5 +227,11 @@
         where del_flag = '0' and line_code = #{lineCode}
           and product_code = #{productCode}
     </select>
+    <select id="getEquMap" resultType="com.op.mes.domain.MesLine">
+        select sap_code sapCode,
+               equipment_code lineCode
+        from base_equipment
+        where equipment_type_code = 'equ_type_bzx' and del_flag = '0'
+    </select>
 
 </mapper>