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 2d8be469..bb611e1c 100644 --- a/src/main/java/com/spring/modules/sampleManagement/entity/PlmBmPrintFlexoColor.java +++ b/src/main/java/com/spring/modules/sampleManagement/entity/PlmBmPrintFlexoColor.java @@ -18,6 +18,8 @@ public class PlmBmPrintFlexoColor { */ private String codeNo; + private String showOrder; + /** * Print Side 正反面 */ @@ -97,6 +99,14 @@ public class PlmBmPrintFlexoColor { private String speed; + public String getShowOrder() { + return showOrder; + } + + public void setShowOrder(String showOrder) { + this.showOrder = showOrder; + } + public String getSpeed() { return speed; } 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 733d2c8f..77fbcf88 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 @@ -1369,15 +1369,18 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification } // 查出单位是kg的物料 List list = bomManagementMapper.queryBomComponentByKg(bomDetailEntity.get(0)); + Integer showOrder = 1; for (BomComponentVo component : list) { PlmBmPrintFlexoColorData colorData = new PlmBmPrintFlexoColorData(); colorData.setSite(data.getSite()); colorData.setCodeNo(data.getCodeNo()); colorData.setOrder(component.getLineSequence()); - colorData.setPrintSide(data.getPrintSide()); + colorData.setShowOrder(showOrder.toString()); + colorData.setPrintSide(data.getPrintSide().substring(0, 1).toUpperCase() + data.getPrintSide().substring(1)); colorData.setInkCode(component.getComponentPart()); colorData.setUpdateBy(data.getUpdateBy()); colorList.add(colorData); + showOrder++; } // 批量新增 if (!colorList.isEmpty()) { diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml index d10304a5..e0d825d9 100644 --- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml +++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml @@ -2043,11 +2043,12 @@ a.updateDate, a.updateBy, a.resource_no, - a.speed + a.speed, + a.show_order from plm_bm_printFlexoColor as a left join part as p on a.site = p.site and a.inkCode = p.part_no where a.site = #{site} and a.codeNo = #{codeNo} - order by a.printSide desc, [order] + order by a.show_order