From 2dd9c220739ddc305283ddc885af4ecf584b3fd5 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Sat, 7 Jun 2025 10:47:02 +0800 Subject: [PATCH] =?UTF-8?q?2025-06-07=20=E6=B2=B9=E5=A2=A8=E9=85=8D?= =?UTF-8?q?=E6=96=B9=E5=B0=86=E4=B8=A4=E4=B8=AAGallus(level%)=E4=B8=8EL/H?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E6=88=90=E6=9C=BA=E5=8F=B0=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E9=9C=80=E8=A6=81Level%=20=E5=8F=AF=E9=80=89=E5=80=BC=EF=BC=9A?= =?UTF-8?q?BOBST=E3=80=81Hyde=E3=80=81Taiyo=E3=80=81Label=20Man?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/PlmBmPrintFlexoColor.java | 10 ++ .../entity/PlmBmPrintingColor.java | 10 ++ .../TechnicalSpecificationServiceImpl.java | 8 +- .../TechnicalSpecificationMapper.xml | 162 +++++++++--------- 4 files changed, 108 insertions(+), 82 deletions(-) diff --git a/src/main/java/com/spring/modules/sampleManagement/entity/PlmBmPrintFlexoColor.java b/src/main/java/com/spring/modules/sampleManagement/entity/PlmBmPrintFlexoColor.java index e9e0841a..5195b370 100644 --- a/src/main/java/com/spring/modules/sampleManagement/entity/PlmBmPrintFlexoColor.java +++ b/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; } diff --git a/src/main/java/com/spring/modules/sampleManagement/entity/PlmBmPrintingColor.java b/src/main/java/com/spring/modules/sampleManagement/entity/PlmBmPrintingColor.java index 24883d14..1a061ff8 100644 --- a/src/main/java/com/spring/modules/sampleManagement/entity/PlmBmPrintingColor.java +++ b/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; } diff --git a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java index f539837e..5d300723 100644 --- a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java +++ b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java @@ -1094,13 +1094,13 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification public void saveBMPrintingColor(PlmBmPrintingColorData data){ SysUserEntity sysUserEntity = (SysUserEntity) SecurityUtils.getSubject().getPrincipal(); data.setUpdateBy(sysUserEntity.getUsername()); - if(data.getId()==0){ - List checkOrder=technicalSpecificationMapper.checkPlmBmPrintingColorOrder(data); - if(checkOrder.size()>0){ + if (data.getId() == 0) { + List checkOrder = technicalSpecificationMapper.checkPlmBmPrintingColorOrder(data); + if (!checkOrder.isEmpty()) { throw new RuntimeException("该色序的编号已经重复!"); } technicalSpecificationMapper.saveBMPrintingColor(data); - }else{ + } else { technicalSpecificationMapper.updateBMPrintingColor(data); } } diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml index 77cd64d7..2d5d5d32 100644 --- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml +++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml @@ -1751,61 +1751,65 @@ - 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 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 (#{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}) update plm_bm_PrintingColor - set [order]=#{order}, - ink_type=#{inkType}, - [color_reference]=#{colorReference}, - color_match=#{colorMatch}, - bcm=#{bcm}, - speed=#{speed}, - dry=#{dry}, - gallus=#{gallus}, - mark_andy=#{markAndy}, - lp=#{lp}, - Hexiang=#{hexiang}, - update_date=GetDate(), - update_by=#{updateBy} + set [order] = #{order}, + ink_type = #{inkType}, + [color_reference] = #{colorReference}, + color_match = #{colorMatch}, + bcm = #{bcm}, + speed = #{speed}, + dry = #{dry}, + gallus = #{gallus}, + mark_andy = #{markAndy}, + lp = #{lp}, + Hexiang = #{hexiang}, + update_date = GetDate(), + update_by = #{updateBy}, + resource_no = #{resourceNo} where id = #{id} @@ -1988,27 +1992,28 @@ @@ -2024,41 +2029,42 @@ 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 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 (#{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}) update plm_bm_printFlexoColor - set printSide=#{printSide}, - [order]=#{order,jdbcType=INTEGER}, - colorReference=#{colorReference}, - inkCode=#{inkCode}, - colorMatch=#{colorMatch}, - lpi=#{lpi}, - bcm=#{bcm}, - openFlag=#{openFlag}, - gallus=#{gallus}, - markAndy=#{markAndy}, - hexiang=#{hexiang}, - temperature=#{temperature}, - pressure=#{pressure}, - updateDate=GetDate(), - updateBy=#{updateBy}, - remark=#{remark} + set printSide = #{printSide}, + [order] = #{order,jdbcType=INTEGER}, + colorReference = #{colorReference}, + inkCode = #{inkCode}, + colorMatch = #{colorMatch}, + lpi = #{lpi}, + bcm = #{bcm}, + openFlag = #{openFlag}, + gallus = #{gallus}, + markAndy = #{markAndy}, + hexiang = #{hexiang}, + temperature = #{temperature}, + pressure = #{pressure}, + updateDate = GetDate(), + updateBy = #{updateBy}, + remark = #{remark}, + resource_no = #{resourceNo} where id = #{id} @@ -2069,7 +2075,7 @@ delete from plm_bm_printFlexoColor - where site = #{site} and code_no = #{codeNo} + where site = #{site} and codeNo = #{codeNo}