Merge remote-tracking branch 'origin/master'

mes/src/main/java/com/ximai/mes/pro/controller/ProProductQrcodeRuleController.java

@@ -53,6 +53,8 @@ public class ProProductQrcodeRuleController extends BaseController
         QueryWrapper<ProProductQrcodeRule> query = new QueryWrapper<>();
         query.eq(proProductQrcodeRuleQuery.getItemId()!=null, "m.item_id", proProductQrcodeRuleQuery.getItemId());
         query.eq(StringUtils.isNotEmpty(proProductQrcodeRuleQuery.getItemCode()), "m.item_code", proProductQrcodeRuleQuery.getItemCode());
+        query.like(StringUtils.isNotEmpty(proProductQrcodeRuleQuery.getItemName()), "item.item_name", "%" +proProductQrcodeRuleQuery.getItemName()+ "%");
+
         query.eq(StringUtils.isNotEmpty(proProductQrcodeRuleQuery.getPrefix()), "m.prefix", proProductQrcodeRuleQuery.getPrefix());
         query.eq(StringUtils.isNotEmpty(proProductQrcodeRuleQuery.getDatePattern()), "m.date_pattern", proProductQrcodeRuleQuery.getDatePattern());
         query.eq(proProductQrcodeRuleQuery.getSerialLen()!=null, "m.serial_len", proProductQrcodeRuleQuery.getSerialLen());

mes/src/main/java/com/ximai/mes/pro/domain/productionSolution/ProProductionSolutionProcess.java

@@ -244,4 +244,20 @@ public class ProProductionSolutionProcess {
      */
     @ApiModelProperty("单价")
     private BigDecimal unitPrice;
+    /**
+     * 工序流向id
+     */
+    private Long directionProcessId;
+
+    /**
+     * 工序流向编码
+     */
+    private String directionProcessCode;
+
+
+    /**
+     * 工序流向编码
+     */
+    private String directionProcessName;
+
 }

mes/src/main/java/com/ximai/mes/pro/domain/vo/ProProductionSolutionProcessVo.java

@@ -249,6 +249,22 @@ public class ProProductionSolutionProcessVo extends BaseEntity {
     private BigDecimal unitPrice;
 
 
+    /**
+     * 工序流向id
+     */
+    private Long directionProcessId;
+
+    /**
+     * 工序流向编码
+     */
+    private String directionProcessCode;
+
+
+    /**
+     * 工序流向编码
+     */
+    private String directionProcessName;
+
     /**
      * 生产版本工序图纸
      **/

mes/src/main/java/com/ximai/mes/pro/dto/ProProductQrcodeRuleQuery.java

@@ -75,6 +75,6 @@ public class ProProductQrcodeRuleQuery {
     @ApiModelProperty("更新时间")
     private Date updateTime;
 
-
+    private String itemName;
 
 }

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

@@ -215,9 +215,10 @@ public class ProProductionSolutionServiceImpl implements IProProductionSolutionS
                 //判断产品相关编号大小
                 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"));
+                    if(StringUtils.isNotEmpty(proProductionSolutions.get(0).getProductionSolutionCode())){
+                        Long longOld = new Long(proProductionSolutions.get(0).getProductionSolutionCode());
+                        Long longNew = new Long(proProductionSolutionVo.getProductionSolutionCode());
+                        ExceptionUtil.checkTrueThrowException(longOld > longNew, MessageUtils.message("md.workStation.error.productionSolutionCode.size"));
                     }
                 }
             }

mes/src/main/java/com/ximai/mes/pro/service/impl/task/ProTaskServiceImpl.java

@@ -1122,17 +1122,13 @@ public class ProTaskServiceImpl implements IProTaskService {
         ProTaskWorkunit taskWorkunitSplitConst = proTaskVo.getTaskWorkunit();
         BigDecimal splitQuantityConst = taskWorkunitSplitConst.getQuantity();
         ExceptionUtil.checkTrueThrowException(
-                splitQuantityConst.doubleValue() > proTask.getQuantityWait().doubleValue(),
+                splitQuantityConst.doubleValue() > proTask.getQuantity().subtract(proTask.getQuantityProduced()).doubleValue(),
                 MessageUtils.message("pro.schedule.error.split.quantity.lack"));
 
 
         ProTaskWorkunit mainTaskWorkunitVal = null;
         if (TaskConst.ASSIST_TASK.equals(type)) {
-            DoubleSummaryStatistics summaryStatistics = proTaskWorkunits.stream().map(x -> x.getQuantity().subtract(x.getQuantityProduced()).doubleValue()).filter(x -> x > 0).collect(Collectors.summarizingDouble(x -> x));
-            double sum = summaryStatistics.getSum();
-
             AtomicReference<Double> splitQuantity = new AtomicReference<>(splitQuantityConst.doubleValue());
-
             sortDeduction(proTaskWorkunits, splitQuantity, TaskWorkunitStatusEnum.PREPARE.getStatus());
             sortDeduction(proTaskWorkunits, splitQuantity, TaskWorkunitStatusEnum.BEGINNING.getStatus());
             sortDeduction(proTaskWorkunits, splitQuantity, TaskWorkunitStatusEnum.PAUSE.getStatus());

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

@@ -93,7 +93,10 @@
                ppsp.sacm_for_slitting,
                pro.process_code, pro.process_name,
                pro.process_id,
-               ppsp.unit_price
+               ppsp.unit_price,
+               ppsp.direction_process_id,
+               ppsp.direction_process_code,
+               ppsp.direction_process_name
         from pro_production_solution_process ppsp
                  left join pro_process pro on pro.process_id = ppsp.process_id
                  left join md_workstation mw on ppsp.workstation_id = mw.workstation_id
@@ -165,6 +168,10 @@
             <if test="sacmForMolarTooth != null">sacm_for_molar_tooth,</if>
             <if test="sacmForSlitting != null">sacm_for_slitting,</if>
             <if test="unitPrice != null">unit_price,</if>
+
+            <if test="directionProcessId != null">direction_Process_Name,</if>
+            <if test="directionProcessCode != null">direction_Process_Code,</if>
+            <if test="directionProcessName != null">direction_Process_Name,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="productionSolutionId != null">#{productionSolutionId},</if>
@@ -206,6 +213,11 @@
             <if test="sacmForMolarTooth != null">#{sacmForMolarTooth},</if>
             <if test="sacmForSlitting != null">#{sacmForSlitting},</if>
             <if test="unitPrice != null">#{unitPrice},</if>
+
+
+            <if test="directionProcessId != null">#{directionProcessId},</if>
+            <if test="directionProcessCode != null">#{directionProcessCode},</if>
+            <if test="directionProcessName != null">#{directionProcessName},</if>
         </trim>
     </insert>
 
@@ -251,6 +263,10 @@
             <if test="sacmForMolarTooth != null">sacm_for_molar_tooth = #{sacmForMolarTooth},</if>
             <if test="sacmForSlitting != null">sacm_for_slitting = #{sacmForSlitting},</if>
             <if test="unitPrice != null">unit_price = #{unitPrice},</if>
+
+            <if test="directionProcessId != null">direction_Process_Name = #{directionProcessId},</if>
+            <if test="directionProcessCode != null">direction_Process_Code = #{directionProcessCode},</if>
+            <if test="directionProcessName != null">direction_Process_Name = #{directionProcessName},</if>
         </trim>
         where production_solution_process_id = #{productionSolutionProcessId}
     </update>