更新生产版本新增逻辑

admin/src/main/resources/i18n/messages.properties

@@ -78,6 +78,9 @@ md.factory.error.not.exist=\u5DE5\u5382\u4E0D\u5B58\u5728
 md.workShop.error.not.exist=\u8F66\u95F4\u4E0D\u5B58\u5728
 #md.workStation
 md.workStation.error.not.exist=\u5DE5\u4F5C\u4E2D\u5FC3\u4E0D\u5B58\u5728
+md.workStation.error.not.productionSolutionCode = \u751f\u4ea7\u7248\u672c\u53f7\u4e0d\u5141\u8bb8\u4e3a\u7a7a
+md.workStation.error.productionSolutionCode.unique = \u8be5\u4ea7\u54c1\u4e0b\u5df2\u6709\u76f8\u5173\u751f\u4ea7\u7248\u672c\u53f7
+md.workStation.error.productionSolutionCode.size = \u8be5\u4ea7\u54c1\u4e0b\u5df2\u6709\u76f8\u5173\u751f\u4ea7\u7248\u672c\u53f7\u5df2\u6709\u6570\u503c\u8f83\u5927\u7684\u5b58\u5728
 md.workStation.error.cannot.remove=\u8BE5\u5DE5\u4F5C\u4E2D\u5FC3\u5DF2\u7ECF\u4F7F\u7528\uFF0C\u4E0D\u80FD\u5173\u95ED
 #md.workUnit
 md.workUnit.error.not.exist=\u5DE5\u4F5C\u5355\u5143\u4E0D\u5B58\u5728

admin/src/main/resources/i18n/messages_en.properties

@@ -76,6 +76,9 @@ md.factory.error.not.exist=Factory does not exist.
 md.workShop.error.not.exist=Workshop does not exist.
 #md.workStation
 md.workStation.error.not.exist=Work center does not exist.
+md.workStation.error.not.productionSolutionCode = not productionSolutionCode.
+md.workStation.error.productionSolutionCode.unique = unique productionSolutionCode.
+md.workStation.error.productionSolutionCode.size =  productionSolutionCode : A larger value already exists
 md.workStation.error.cannot.remove=This work center has been used and cannot be closed.
 #md.workUnit
 md.workUnit.error.not.exist=Work unit does not exist.

admin/src/main/resources/i18n/messages_th.properties

@@ -213,4 +213,7 @@ qc.error.error5=\u0E1C\u0E25\u0E34\u0E15\u0E20\u0E31\u0E13\u0E11\u0E4C\u0E17\u0E
 qc.error.error6=\u0E2B\u0E21\u0E32\u0E22\u0E40\u0E25\u0E02\u0E01\u0E32\u0E23\u0E15\u0E23\u0E27\u0E08\u0E2A\u0E2D\u0E1A\u0E21\u0E35\u0E2D\u0E22\u0E39\u0E48\u0E41\u0E25\u0E49\u0E27
 qc.error.error7=\u0E21\u0E35\u0E0A\u0E37\u0E48\u0E2D\u0E23\u0E32\u0E22\u0E01\u0E32\u0E23\u0E15\u0E23\u0E27\u0E08\u0E2A\u0E2D\u0E1A\u0E2D\u0E22\u0E39\u0E48\u0E41\u0E25\u0E49\u0E27
 #system.printer
-system.printer.error.repeat.bind=\u0E40\u0E04\u0E23\u0E37\u0E48\u0E2D\u0E07\u0E1E\u0E34\u0E21\u0E1E\u0E4C\u0E16\u0E39\u0E01\u0E1C\u0E39\u0E01\u0E44\u0E27\u0E49
\ No newline at end of file
+system.printer.error.repeat.bind=\u0E40\u0E04\u0E23\u0E37\u0E48\u0E2D\u0E07\u0E1E\u0E34\u0E21\u0E1E\u0E4C\u0E16\u0E39\u0E01\u0E1C\u0E39\u0E01\u0E44\u0E27\u0E49
+md.workStation.error.not.productionSolutionCode = \u0050\u0072\u006f\u0064\u0075\u0063\u0074\u0069\u006f\u006e\u0053\u006f\u006c\u0075\u0074\u0069\u006f\u006e\u0043\u006f\u0064\u0065\u0020\u0e44\u0e21\u0e48\u0e44\u0e14\u0e49\u0e01\u0e23\u0e2d\u0e01
+md.workStation.error.productionSolutionCode.unique = \u0050\u0072\u006f\u0064\u0075\u0063\u0074\u0069\u006f\u006e\u0053\u006f\u006c\u0075\u0074\u0069\u006f\u006e\u0043\u006f\u0064\u0065\u003a\u0020\u0e44\u0e21\u0e48\u0e40\u0e09\u0e1e\u0e32\u0e30
+md.workStation.error.productionSolutionCode.size = \u0050\u0072\u006f\u0064\u0075\u0063\u0074\u0069\u006f\u006e\u0053\u006f\u006c\u0075\u0074\u0069\u006f\u006e\u0043\u006f\u0064\u0065\u003a\u0020\u0e21\u0e35\u0e04\u0e48\u0e32\u0e21\u0e32\u0e01\u0e02\u0e36\u0e49\u0e19\u0e2d\u0e22\u0e39\u0e48\u0e41\u0e25\u0e49\u0e27
\ No newline at end of file

admin/src/main/resources/i18n/messages_zh_CN.properties

@@ -78,6 +78,9 @@ md.factory.error.not.exist=\u5DE5\u5382\u4E0D\u5B58\u5728
 md.workShop.error.not.exist=\u8F66\u95F4\u4E0D\u5B58\u5728
 #md.workStation
 md.workStation.error.not.exist=\u5DE5\u4F5C\u4E2D\u5FC3\u4E0D\u5B58\u5728
+md.workStation.error.not.productionSolutionCode = \u751f\u4ea7\u7248\u672c\u53f7\u4e0d\u5141\u8bb8\u4e3a\u7a7a
+md.workStation.error.productionSolutionCode.unique = \u8be5\u4ea7\u54c1\u4e0b\u5df2\u6709\u76f8\u5173\u751f\u4ea7\u7248\u672c\u53f7
+md.workStation.error.productionSolutionCode.size = \u8be5\u4ea7\u54c1\u4e0b\u5df2\u6709\u76f8\u5173\u751f\u4ea7\u7248\u672c\u53f7\u5df2\u6709\u6570\u503c\u8f83\u5927\u7684\u5b58\u5728
 md.workStation.error.cannot.remove=\u8BE5\u5DE5\u4F5C\u4E2D\u5FC3\u5DF2\u7ECF\u4F7F\u7528\uFF0C\u4E0D\u80FD\u5173\u95ED
 #md.workUnit
 md.workUnit.error.not.exist=\u5DE5\u4F5C\u5355\u5143\u4E0D\u5B58\u5728

mes/src/main/java/com/ximai/mes/pro/mapper/productionSolution/ProProductionSolutionMapper.java

@@ -81,4 +81,6 @@ public interface ProProductionSolutionMapper extends BaseMapper<ProProductionSol
             " on pps.production_solution_id=s.production_solution_id  \n" +
             " where CONCAT(group_key, group_counter) like concat('%', #{groupCounter}, '%') ")
     ProProductionSolutionSpecificationSheet selectModule(@Param("groupCounter") String groupCounter);
+
+    List<ProProductionSolution> selectProductionSolutionCode(@Param("itemId")Long itemId, @Param("productionSolutionCode")String productionSolutionCode);
 }

mes/src/main/java/com/ximai/mes/pro/service/impl/productionSolution/ProProductionSolutionServiceImpl.java

@@ -191,14 +191,34 @@ public class ProProductionSolutionServiceImpl implements IProProductionSolutionS
         // 数据转换
 
         String itemCode = proProductionSolutionVo.getItemCode();
+        MdItem mdItem = null;
         if (StringUtils.isNotNull(itemCode)) {
-            MdItem mdItem = mdItemMapper.selectMdItemByCodes(itemCode);
+            mdItem = mdItemMapper.selectMdItemByCodes(itemCode);
             ExceptionUtil.checkTrueThrowException(ObjectUtil.isEmpty(mdItem), MessageUtils.message("pro.material.error.not.exist"));
             if (ObjectUtil.isNotEmpty(mdItem)) {
                 proProductionSolution.setItemId(mdItem.getItemId());
             }
         }
 
+        if(StringUtils.isEmpty(proProductionSolutionVo.getProductionSolutionCode())){
+            //不允许为空
+            ExceptionUtil.checkTrueThrowException(true, MessageUtils.message("md.workStation.error.not.productionSolutionCode"));
+        }else{
+            if(mdItem != null){
+                //判断编号是否未使用
+                List<ProProductionSolution> proProductionSolutions = proProductionSolutionMapper.selectProductionSolutionCode(mdItem.getItemId(),proProductionSolutionVo.getProductionSolutionCode());
+                ExceptionUtil.checkTrueThrowException(proProductionSolutions.size() > 0, MessageUtils.message("md.workStation.error.productionSolutionCode.unique"));
+                //判断产品相关编号大小
+                proProductionSolutions = proProductionSolutionMapper.selectProductionSolutionCode(mdItem.getItemId(),null);
+                if(proProductionSolutions.size() > 0){
+                    if(StringUtils.isNotEmpty(proProductionSolutions.get(0).getProductionSolutionCode())
+                            && proProductionSolutions.get(0).getProductionSolutionCode().compareTo(proProductionSolutionVo.getProductionSolutionCode()) > 0){
+                        ExceptionUtil.checkTrueThrowException(true, MessageUtils.message("md.workStation.error.productionSolutionCode.size"));
+                    }
+                }
+            }
+
+        }
 
         // 保存主数据
         int i = proProductionSolutionMapper.insertProProductionSolution(proProductionSolution);
@@ -331,7 +351,7 @@ public class ProProductionSolutionServiceImpl implements IProProductionSolutionS
                     for (ProProductionSolutionProcessToolVo proProductionSolutionProcessToolVo : toolList) {
                         ProProductionSolutionProcessTool proProductionSolutionProcessTool = new ProProductionSolutionProcessTool();
                         BeanUtils.copyProperties(proProductionSolutionProcessToolVo, proProductionSolutionProcessTool);
-                        MdItem mdItem = mdItemMapper.selectMdItemByCodea(proProductionSolutionProcessToolVo.getItemCode());
+                        mdItem = mdItemMapper.selectMdItemByCodea(proProductionSolutionProcessToolVo.getItemCode());
                         proProductionSolutionProcessTool.setToolId(mdItem.getItemId());
                         proProductionSolutionProcessTool.setPrototypeSolutionId(productionSolutionId);
                         proProductionSolutionProcessTool.setPrototypeSolutionProcessId(productionSolutionProcessId);

mes/src/main/resources/mapper/pro/productionSolution/ProProductionSolutionMapper.xml

@@ -129,6 +129,18 @@
         where pps.sap_prototype_make_code = #{sapPrototypeMakeCode}
 
     </select>
+    <select id="selectProductionSolutionCode"
+            resultType="com.ximai.mes.pro.domain.productionSolution.ProProductionSolution">
+        select * from pro_production_solution
+        <where>
+            <if test="productionSolutionCode != null">
+                production_solution_code = #{productionSolutionCode}
+            </if>
+            and  item_id = #{itemId}
+        </where>
+        order by production_solution_code desc
+
+    </select>
 
 
     <insert id="insertProProductionSolution" parameterType="ProProductionSolution" useGeneratedKeys="true"