hongxudong 1 год назад
Родитель
Сommit
862655429c

+ 3 - 0
src/main/java/com/dk/mdm/mapper/mst/ErpNodeMapper.xml

@@ -29,6 +29,9 @@
             <if test="nodeName != null and nodeName != ''">
                 AND position(#{nodeName} in ten.node_name) > 0
             </if>
+            <if test="nodeType != null and nodeType != ''">
+                AND ten.node_type = #{nodeType}
+            </if>
             <if test="flgValidList != null and flgValidList.size()>0">
                 AND ten.flg_valid = any(#{flgValidList, typeHandler= BooleanListTypeHandler})
             </if>

+ 3 - 1
src/main/java/com/dk/mdm/model/pojo/pdm/Production.java

@@ -539,7 +539,9 @@ public class Production implements Serializable {
                 .setPdtUniqueId(productId)
                 .setFlowNodeId(moldingItem.getFlowNodeId()).setStationId(moldingItem.getStationId())
                 .setPdtModelId(pdtModelId!=null?pdtModelId:moldingItem.getPdtModelId()).setPdtLogoId(moldingItem.getPdtLogoId())
-                .setPdtColourId(moldingItem.getPdtColourId()).setErpModelCode(moldingItem.getErpModelCode())
+                .setPdtColourId(moldingItem.getPdtColourId())
+                .setErpSkuId(moldingItem.getErpSkuId())
+                .setErpModelCode(moldingItem.getErpModelCode())
                 //条码模式时为1
                 .setPdtProdQty(1)
                 //默认1