From c7b7eb8e5388596a0d6026c565b112956bf07e66 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Tue, 16 Apr 2024 18:03:00 +0800 Subject: [PATCH] 1127 --- .../TechnicalSpecificationController.java | 43 +++ .../dao/TechnicalSpecificationMapper.java | 14 + .../data/PlmBmPrintFlexoColorData.java | 11 + .../data/PlmBmPrintIndigoColorData.java | 9 + .../entity/PlmBmPrintFlexoColor.java | 248 ++++++++++++++++++ .../entity/PlmBmPrintIndigoColor.java | 240 +++++++++++++++++ .../TechnicalSpecificationServiceImpl.java | 54 ++++ .../TechnicalSpecificationService.java | 16 ++ .../TechnicalSpecificationMapper.xml | 58 ++++ 9 files changed, 693 insertions(+) create mode 100644 src/main/java/com/spring/modules/sampleManagement/data/PlmBmPrintFlexoColorData.java create mode 100644 src/main/java/com/spring/modules/sampleManagement/data/PlmBmPrintIndigoColorData.java create mode 100644 src/main/java/com/spring/modules/sampleManagement/entity/PlmBmPrintFlexoColor.java create mode 100644 src/main/java/com/spring/modules/sampleManagement/entity/PlmBmPrintIndigoColor.java diff --git a/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java b/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java index d78c943d..9fd65a89 100644 --- a/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java +++ b/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java @@ -1106,4 +1106,47 @@ public class TechnicalSpecificationController { BmUrlData result= technicalSpecificationService.checkUrl(data); return R.ok().put("url", result.getUrl()); } + + + @PostMapping(value="/searchBMprintFlexoColor") + @ResponseBody + public R searchBMprintFlexoColor(@RequestBody SearchBMData data){ + List rows= technicalSpecificationService.searchBMprintFlexoColor(data); + return R.ok().put("rows", rows); + } + + @PostMapping(value="/saveBMprintFlexoColor") + @ResponseBody + public R saveBMPrintingColor(@RequestBody PlmBmPrintFlexoColorData data){ + technicalSpecificationService.saveBMprintFlexoColor(data); + return R.ok(); + } + + @PostMapping(value="/deleteBMprintFlexoColor") + @ResponseBody + public R deleteBMprintFlexoColor(@RequestBody PlmBmPrintFlexoColorData data){ + technicalSpecificationService.deleteBMprintFlexoColor(data); + return R.ok(); + } + + @PostMapping(value="/searchBMprintIndigoColor") + @ResponseBody + public R searchBMprintIndigoColor(@RequestBody SearchBMData data){ + List rows= technicalSpecificationService.searchBMprintIndigoColor(data); + return R.ok().put("rows", rows); + } + + @PostMapping(value="/saveBMprintIndigoColor") + @ResponseBody + public R saveBMPrintingColor(@RequestBody PlmBmPrintIndigoColorData data){ + technicalSpecificationService.saveBMprintIndigoColor(data); + return R.ok(); + } + + @PostMapping(value="/deleteBMprintIndigoColor") + @ResponseBody + public R deleteBMprintIndigoColor(@RequestBody PlmBmPrintIndigoColorData data){ + technicalSpecificationService.deleteBMprintIndigoColor(data); + return R.ok(); + } } diff --git a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java index 35363cff..3bdcb8bc 100644 --- a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java +++ b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java @@ -1122,4 +1122,18 @@ public interface TechnicalSpecificationMapper { List searchPartLastQuotationNo(QuotationDetailVo data); List getSysProxyAddress(); + + + List searchBMprintFlexoColor(SearchBMData data); + List checkBMprintFlexoColorOrder(PlmBmPrintFlexoColorData data); + void updateBMprintFlexoColor(PlmBmPrintFlexoColorData data); + void saveBMprintFlexoColor(PlmBmPrintFlexoColorData data); + void deleteBMprintFlexoColor(PlmBmPrintFlexoColorData data); + + + List searchBMprintIndigoColor(SearchBMData data); + List checkBMprintIndigoColorOrder(PlmBmPrintIndigoColorData data); + void updateBMprintIndigoColor(PlmBmPrintIndigoColorData data); + void saveBMprintIndigoColor(PlmBmPrintIndigoColorData data); + void deleteBMprintIndigoColor(PlmBmPrintIndigoColorData data); } diff --git a/src/main/java/com/spring/modules/sampleManagement/data/PlmBmPrintFlexoColorData.java b/src/main/java/com/spring/modules/sampleManagement/data/PlmBmPrintFlexoColorData.java new file mode 100644 index 00000000..134e0957 --- /dev/null +++ b/src/main/java/com/spring/modules/sampleManagement/data/PlmBmPrintFlexoColorData.java @@ -0,0 +1,11 @@ +package com.spring.modules.sampleManagement.data; + +import com.spring.modules.sampleManagement.entity.PlmBmPrintFlexoColor; +import org.apache.ibatis.type.Alias; + +import java.util.Date; +@Alias("PlmBmPrintFlexoColorData") +public class PlmBmPrintFlexoColorData extends PlmBmPrintFlexoColor { + +} + diff --git a/src/main/java/com/spring/modules/sampleManagement/data/PlmBmPrintIndigoColorData.java b/src/main/java/com/spring/modules/sampleManagement/data/PlmBmPrintIndigoColorData.java new file mode 100644 index 00000000..f14ff09f --- /dev/null +++ b/src/main/java/com/spring/modules/sampleManagement/data/PlmBmPrintIndigoColorData.java @@ -0,0 +1,9 @@ +package com.spring.modules.sampleManagement.data; + +import com.spring.modules.sampleManagement.entity.PlmBmPrintIndigoColor; +import org.apache.ibatis.type.Alias; + +@Alias("PlmBmPrintIndigoColorData") +public class PlmBmPrintIndigoColorData extends PlmBmPrintIndigoColor { + +} diff --git a/src/main/java/com/spring/modules/sampleManagement/entity/PlmBmPrintFlexoColor.java b/src/main/java/com/spring/modules/sampleManagement/entity/PlmBmPrintFlexoColor.java new file mode 100644 index 00000000..e9e0841a --- /dev/null +++ b/src/main/java/com/spring/modules/sampleManagement/entity/PlmBmPrintFlexoColor.java @@ -0,0 +1,248 @@ +package com.spring.modules.sampleManagement.entity; + +import java.util.Date; + +public class PlmBmPrintFlexoColor { + /** + * + */ + private Integer id; + + /** + * + */ + private String site; + + /** + * + */ + private String codeNo; + + /** + * Print Side 正反面 + */ + private String printSide; + + /** + * 色序 + */ + private Integer order; + + /** + * 颜色参考 + */ + private String colorReference; + + /** + * 油墨代号/颜色IFS No + */ + private String inkCode; + + /** + * 颜色匹配 + */ + private String colorMatch; + + /** + * 线数(LPI) + */ + private String lpi; + + /** + * 容积(BCM) + */ + private String bcm; + + /** + * (ON /OFF) + */ + private String openFlag; + + /** + * Gallus(level%) + */ + private String gallus; + + /** + * MarkAndy(level%) + */ + private String markAndy; + + /** + * Hexiang(L/H) + */ + private String hexiang; + + /** + * temperature + */ + private String temperature; + + /** + * pressure + */ + private String pressure; + private String remark; + /** + * + */ + private Date updateDate; + + /** + * + */ + private String updateBy; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public String getCodeNo() { + return codeNo; + } + + public void setCodeNo(String codeNo) { + this.codeNo = codeNo; + } + + public String getPrintSide() { + return printSide; + } + + public void setPrintSide(String printSide) { + this.printSide = printSide; + } + + public Integer getOrder() { + return order; + } + + public void setOrder(Integer order) { + this.order = order; + } + + public String getColorReference() { + return colorReference; + } + + public void setColorReference(String colorReference) { + this.colorReference = colorReference; + } + + public String getInkCode() { + return inkCode; + } + + public void setInkCode(String inkCode) { + this.inkCode = inkCode; + } + + public String getColorMatch() { + return colorMatch; + } + + public void setColorMatch(String colorMatch) { + this.colorMatch = colorMatch; + } + + public String getLpi() { + return lpi; + } + + public void setLpi(String lpi) { + this.lpi = lpi; + } + + public String getBcm() { + return bcm; + } + + public void setBcm(String bcm) { + this.bcm = bcm; + } + + public String getOpenFlag() { + return openFlag; + } + + public void setOpenFlag(String openFlag) { + this.openFlag = openFlag; + } + + public String getGallus() { + return gallus; + } + + public void setGallus(String gallus) { + this.gallus = gallus; + } + + public String getMarkAndy() { + return markAndy; + } + + public void setMarkAndy(String markAndy) { + this.markAndy = markAndy; + } + + public String getHexiang() { + return hexiang; + } + + public void setHexiang(String hexiang) { + this.hexiang = hexiang; + } + + public String getTemperature() { + return temperature; + } + + public void setTemperature(String temperature) { + this.temperature = temperature; + } + + public String getPressure() { + return pressure; + } + + public void setPressure(String pressure) { + this.pressure = pressure; + } + + public Date getUpdateDate() { + return updateDate; + } + + public void setUpdateDate(Date updateDate) { + this.updateDate = updateDate; + } + + public String getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } +} + diff --git a/src/main/java/com/spring/modules/sampleManagement/entity/PlmBmPrintIndigoColor.java b/src/main/java/com/spring/modules/sampleManagement/entity/PlmBmPrintIndigoColor.java new file mode 100644 index 00000000..3843c21c --- /dev/null +++ b/src/main/java/com/spring/modules/sampleManagement/entity/PlmBmPrintIndigoColor.java @@ -0,0 +1,240 @@ +package com.spring.modules.sampleManagement.entity; + +import java.util.Date; + +public class PlmBmPrintIndigoColor { + /** + * + */ + private Integer id; + + /** + * + */ + private String codeNo; + + /** + * + */ + private String site; + + /** + * + */ + private Integer order; + + /** + * 印刷面 + */ + private String printSide; + + /** + * 颜色参考 + */ + private String colorReference; + + /** + * 油墨代号/颜色IFS No + */ + private String inkCode; + + /** + * 颜色匹配 + */ + private String colorMatch; + + /** + * 印刷档位 + */ + private String printMotion; + + /** + * 实地密度 + */ + private String opticalDensity; + + /** + * 扩张曲线 + */ + private String lut; + + /** + * 加网线数 + */ + private String lpi; + + /** + * 加网角度 + */ + private String screenAngle; + + /** + * 印刷遍数 + */ + private String printHits; + + /** + * 橡皮布温度 + */ + private String blanketTemperture; + + /** + * + */ + private String remark; + + /** + * + */ + private String updateBy; + + /** + * + */ + private Date updateDate; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getCodeNo() { + return codeNo; + } + + public void setCodeNo(String codeNo) { + this.codeNo = codeNo; + } + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public Integer getOrder() { + return order; + } + + public void setOrder(Integer order) { + this.order = order; + } + + public String getPrintSide() { + return printSide; + } + + public void setPrintSide(String printSide) { + this.printSide = printSide; + } + + public String getColorReference() { + return colorReference; + } + + public void setColorReference(String colorReference) { + this.colorReference = colorReference; + } + + public String getInkCode() { + return inkCode; + } + + public void setInkCode(String inkCode) { + this.inkCode = inkCode; + } + + public String getColorMatch() { + return colorMatch; + } + + public void setColorMatch(String colorMatch) { + this.colorMatch = colorMatch; + } + + public String getPrintMotion() { + return printMotion; + } + + public void setPrintMotion(String printMotion) { + this.printMotion = printMotion; + } + + public String getOpticalDensity() { + return opticalDensity; + } + + public void setOpticalDensity(String opticalDensity) { + this.opticalDensity = opticalDensity; + } + + public String getLut() { + return lut; + } + + public void setLut(String lut) { + this.lut = lut; + } + + public String getLpi() { + return lpi; + } + + public void setLpi(String lpi) { + this.lpi = lpi; + } + + public String getScreenAngle() { + return screenAngle; + } + + public void setScreenAngle(String screenAngle) { + this.screenAngle = screenAngle; + } + + public String getPrintHits() { + return printHits; + } + + public void setPrintHits(String printHits) { + this.printHits = printHits; + } + + public String getBlanketTemperture() { + return blanketTemperture; + } + + public void setBlanketTemperture(String blanketTemperture) { + this.blanketTemperture = blanketTemperture; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy; + } + + public Date getUpdateDate() { + return updateDate; + } + + public void setUpdateDate(Date updateDate) { + this.updateDate = updateDate; + } +} + 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 744a342a..5f5d711d 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 @@ -974,5 +974,59 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification return data; } + @Override + public List searchBMprintFlexoColor(SearchBMData data){ + return technicalSpecificationMapper.searchBMprintFlexoColor(data); + } + + @Override + public void saveBMprintFlexoColor(PlmBmPrintFlexoColorData data){ + SysUserEntity sysUserEntity = (SysUserEntity) SecurityUtils.getSubject().getPrincipal(); + data.setUpdateBy(sysUserEntity.getUsername()); + if(data.getId()==0){ + List checkOrder=technicalSpecificationMapper.checkBMprintFlexoColorOrder(data); + if(checkOrder.size()>0){ + throw new RuntimeException("该面色序号已经重复!"); + } + technicalSpecificationMapper.saveBMprintFlexoColor(data); + }else{ + technicalSpecificationMapper.updateBMprintFlexoColor(data); + } + } + + @Override + public void deleteBMprintFlexoColor(PlmBmPrintFlexoColorData data){ + + technicalSpecificationMapper.deleteBMprintFlexoColor(data); + + } + + @Override + public List searchBMprintIndigoColor(SearchBMData data){ + return technicalSpecificationMapper.searchBMprintIndigoColor(data); + } + + @Override + public void saveBMprintIndigoColor(PlmBmPrintIndigoColorData data){ + SysUserEntity sysUserEntity = (SysUserEntity) SecurityUtils.getSubject().getPrincipal(); + data.setUpdateBy(sysUserEntity.getUsername()); + if(data.getId()==0){ + List checkOrder=technicalSpecificationMapper.checkBMprintIndigoColorOrder(data); + if(checkOrder.size()>0){ + throw new RuntimeException("该面色序号已经重复!"); + } + technicalSpecificationMapper.saveBMprintIndigoColor(data); + }else{ + technicalSpecificationMapper.updateBMprintIndigoColor(data); + } + } + + @Override + public void deleteBMprintIndigoColor(PlmBmPrintIndigoColorData data){ + + technicalSpecificationMapper.deleteBMprintIndigoColor(data); + + } + } diff --git a/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java b/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java index 638a4ef8..dfcf2feb 100644 --- a/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java +++ b/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java @@ -941,5 +941,21 @@ public interface TechnicalSpecificationService { List searchPartLastQuotationNo(QuotationDetailVo data); BmUrlData checkUrl(BmUrlData data); + /** + * @Description 柔板印刷固定属性 + * @Title searchBMprintFlexoColor + * @param data + * @author rq + * @date 2024/4/16 15:34 + * @return List + * @throw + */ + List searchBMprintFlexoColor(SearchBMData data); + void saveBMprintFlexoColor(PlmBmPrintFlexoColorData data); + void deleteBMprintFlexoColor(PlmBmPrintFlexoColorData data); + + List searchBMprintIndigoColor(SearchBMData data); + void saveBMprintIndigoColor(PlmBmPrintIndigoColorData data); + void deleteBMprintIndigoColor(PlmBmPrintIndigoColorData data); } diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml index f2103995..3af40b83 100644 --- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml +++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml @@ -839,4 +839,62 @@ a.routing_alternative_no alternativeNo,b.final_part_no partNo + + + + + + insert into plm_bm_printFlexoColor(site,codeNo,printSide,[order],colorReference,inkCode,colorMatch,lpi,bcm,openFlag,gallus,markAndy,hexiang,temperature, +pressure,updateDate,updateBy,remark) values + (#{site},#{codeNo},#{printSide},#{order},#{colorReference},#{inkCode},#{colorMatch},#{lpi},#{bcm},#{openFlag},#{gallus}, + #{markAndy},#{hexiang},#{temperature},#{pressure},GetDate(),#{updateBy},#{remark}) + + + + 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} where id=#{id} + + + + delete from plm_bm_printFlexoColor where id=#{id} + + + + + + + + insert into plm_bm_printIndigoColor(site,code_no,[order],printSide,colorReference,inkCode,colorMatch,printMotion,opticalDensity,lut,lpi,screenAngle,printHits, + blanketTemperture,remark,updateBy,updateDate) values + (#{site},#{codeNo},#{order},#{printSide},#{colorReference},#{inkCode},#{colorMatch},#{printMotion},#{opticalDensity},#{lut},#{lpi}, + #{screenAngle},#{printHits},#{blanketTemperture},#{remark},#{updateBy},GetDate()) + + + + update plm_bm_printIndigoColor set printSide=#{printSide},[order]=#{order,jdbcType=INTEGER},colorReference=#{colorReference},inkCode=#{inkCode}, + colorMatch=#{colorMatch},printMotion=#{printMotion},opticalDensity=#{opticalDensity},lut=#{lut},lpi=#{lpi},screenAngle=#{screenAngle},printHits=#{printHits},blanketTemperture=#{blanketTemperture}, + remark=#{remark},updateDate=GetDate(),updateBy=#{updateBy} where id=#{id} + + + + delete from plm_bm_printIndigoColor where id=#{id} + \ No newline at end of file