2025-06-07

油墨配方将两个Gallus(level%)与L/H替换成机台，不需要Level%
可选值：BOBST、Hyde、Taiyo、Label Man

src/main/java/com/spring/modules/sampleManagement/entity/PlmBmPrintFlexoColor.java

@@ -93,6 +93,16 @@ public class PlmBmPrintFlexoColor {
      */
     private String updateBy;
 
+    private String resourceNo;
+
+    public String getResourceNo() {
+        return resourceNo;
+    }
+
+    public void setResourceNo(String resourceNo) {
+        this.resourceNo = resourceNo;
+    }
+
     public Integer getId() {
         return id;
     }

src/main/java/com/spring/modules/sampleManagement/entity/PlmBmPrintingColor.java

@@ -83,6 +83,16 @@ public class PlmBmPrintingColor {
      */
     private Integer id;
 
+    private String resourceNo;
+
+    public String getResourceNo() {
+        return resourceNo;
+    }
+
+    public void setResourceNo(String resourceNo) {
+        this.resourceNo = resourceNo;
+    }
+
     public String getSite() {
         return site;
     }

src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java

@@ -1096,7 +1096,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
         data.setUpdateBy(sysUserEntity.getUsername());
         if (data.getId() == 0) {
             List<PlmBmPrintingColorData> checkOrder = technicalSpecificationMapper.checkPlmBmPrintingColorOrder(data);
-            if(checkOrder.size()>0){
+            if (!checkOrder.isEmpty()) {
                 throw new RuntimeException("该色序的编号已经重复!");
             }
             technicalSpecificationMapper.saveBMPrintingColor(data);

src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml

@@ -1751,7 +1751,8 @@
     </update>
 
     <select id="searchBMPrintingColor" resultType="PlmBmPrintingColorData">
-        select site,
+        select
+            site,
             code_no,
             [order],
             ink_type,
@@ -1766,28 +1767,30 @@
             Hexiang,
             update_date,
             update_by,
-               id
+            id,
+            resource_no
         from plm_bm_PrintingColor
-        where site = #{site}
-          and code_no = #{codeNo}
+        where site = #{site} and code_no = #{codeNo}
         order by [order]
     </select>
 
     <insert id="saveBMPrintingColor">
-        insert into plm_bm_PrintingColor (site, code_no, [order], ink_type, color_reference, color_match, bcm, speed,
-                                          dry, gallus, mark_andy, lp, Hexiang, update_by, update_date)
-        values (#{site}, #{codeNo}, #{order}, #{inkType}, #{colorReference}, #{colorMatch}, #{bcm}, #{speed}, #{dry},
-                #{gallus}, #{markAndy}, #{lp}, #{hexiang}, #{updateBy}, GetDate())
+        insert into plm_bm_PrintingColor
+        (site, code_no, [order], ink_type, color_reference, color_match, bcm, speed,
+         dry, gallus, mark_andy, lp, Hexiang, update_by, update_date, resource_no)
+        values
+        (#{site}, #{codeNo}, #{order}, #{inkType}, #{colorReference}, #{colorMatch}, #{bcm}, #{speed},
+         #{dry}, #{gallus}, #{markAndy}, #{lp}, #{hexiang}, #{updateBy}, GetDate(), #{resourceNo})
     </insert>
 
     <insert id="saveBMPrintingColors">
         insert into plm_bm_PrintingColor
         (site, code_no, [order], ink_type, color_reference, color_match, bcm, speed,
-         dry, gallus, mark_andy, lp, Hexiang, update_by, update_date)
+         dry, gallus, mark_andy, lp, Hexiang, update_by, update_date, resource_no)
         values
         <foreach collection="list" item="item" index="index" separator=",">
             (#{item.site}, #{item.codeNo}, #{item.order}, #{item.inkType}, #{item.colorReference}, #{item.colorMatch}, #{item.bcm}, #{item.speed},
-            #{item.dry}, #{item.gallus}, #{item.markAndy}, #{item.lp}, #{item.hexiang}, #{item.updateBy}, GetDate())
+            #{item.dry}, #{item.gallus}, #{item.markAndy}, #{item.lp}, #{item.hexiang}, #{item.updateBy}, GetDate(), #{item.resourceNo})
         </foreach>
     </insert>
 
@@ -1805,7 +1808,8 @@
             lp = #{lp},
             Hexiang = #{hexiang},
             update_date = GetDate(),
-            update_by=#{updateBy}
+            update_by = #{updateBy},
+            resource_no = #{resourceNo}
         where id = #{id}
     </update>
 
@@ -1988,7 +1992,8 @@
     </select>
 
     <select id="searchBMprintFlexoColor" resultType="PlmBmPrintFlexoColorData">
-        select id,
+        select
+            id,
             site,
             codeNo,
             printSide,
@@ -2005,10 +2010,10 @@
             temperature,
             pressure,
             updateDate,
-               updateBy
+            updateBy,
+            resource_no
         from plm_bm_printFlexoColor
-        where site = #{site}
-          and codeNo = #{codeNo}
+        where site = #{site} and codeNo = #{codeNo}
         order by printSide desc, [order]
     </select>
 
@@ -2024,20 +2029,20 @@
     <insert id="saveBMprintFlexoColor">
         insert into plm_bm_printFlexoColor
         (site, codeNo, printSide, [order], colorReference, inkCode, colorMatch, lpi,
-         bcm, openFlag, gallus, markAndy, hexiang, temperature, pressure, updateDate, updateBy, remark)
+         bcm, openFlag, gallus, markAndy, hexiang, temperature, pressure, updateDate, updateBy, remark, resource_no)
         values
         (#{site}, #{codeNo}, #{printSide}, #{order}, #{colorReference}, #{inkCode}, #{colorMatch}, #{lpi},
-         #{bcm}, #{openFlag}, #{gallus}, #{markAndy}, #{hexiang}, #{temperature}, #{pressure}, GetDate(), #{updateBy}, #{remark})
+         #{bcm}, #{openFlag}, #{gallus}, #{markAndy}, #{hexiang}, #{temperature}, #{pressure}, GetDate(), #{updateBy}, #{remark}, #{resourceNo})
     </insert>
 
     <insert id="saveBMPrintFlexoColors">
         insert into plm_bm_printFlexoColor
         (site, codeNo, printSide, [order], colorReference, inkCode, colorMatch, lpi,
-         bcm, openFlag, gallus, markAndy, hexiang, temperature, pressure, updateDate, updateBy, remark)
+         bcm, openFlag, gallus, markAndy, hexiang, temperature, pressure, updateDate, updateBy, remark, resource_no)
         values
         <foreach collection="list" item="item" index="index" separator=",">
             (#{item.site}, #{item.codeNo}, #{item.printSide}, #{item.order}, #{item.colorReference}, #{item.inkCode}, #{item.colorMatch}, #{item.lpi},
-            #{item.bcm}, #{item.openFlag}, #{item.gallus}, #{item.markAndy}, #{item.hexiang}, #{item.temperature}, #{item.pressure}, GetDate(), #{item.updateBy}, #{item.remark})
+            #{item.bcm}, #{item.openFlag}, #{item.gallus}, #{item.markAndy}, #{item.hexiang}, #{item.temperature}, #{item.pressure}, GetDate(), #{item.updateBy}, #{item.remark}, #{item.resourceNo})
         </foreach>
     </insert>
 
@@ -2058,7 +2063,8 @@
             pressure = #{pressure},
             updateDate = GetDate(),
             updateBy = #{updateBy},
-            remark=#{remark}
+            remark = #{remark},
+            resource_no = #{resourceNo}
         where id = #{id}
     </update>
 
@@ -2069,7 +2075,7 @@
 
     <delete id="deleteBMPrintFlexoColorByCodeNo">
         delete from plm_bm_printFlexoColor
-        where site = #{site} and code_no = #{codeNo}
+        where site = #{site} and codeNo = #{codeNo}
     </delete>
 
     <select id="searchBMprintIndigoColor" resultType="PlmBmPrintIndigoColorData">