产品主键跟踪

op-modules/op-mes/src/main/java/com/op/mes/domain/MesProductTrace.java

@@ -31,7 +31,7 @@ public class MesProductTrace extends BaseEntity {
     private String unity;
     @Excel(name = "检验标准")
     private String standarNo;
-    @Excel(name = "箱型")
+    //@Excel(name = "箱型")
     private String boxType;
     @Excel(name = "垛型")
     private String packType;

op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml

@@ -1092,11 +1092,11 @@ WHERE
 			   bp.product_desc_en productDescEn,
 			   bp.mvgr5_nm batchMax,
 			   bpa.pallet_num palletNum,
-			   concat(mb.length,'*',mb.width,'*',mb.height) spec,
+			   concat(bp.length,'*',bp.width,'*',bp.height) spec,
 			   bp.product_group_name productGroupName,
 			   bp.umrez unity,
 			   bp.mvgr5 standarNo,
-			   bp.box_type boxType,bpa.pack_type packType,
+			   bpa.pack_type packType,
 			   bpa.cpk_type cpkType, dict.dict_label cpkTypeName
 		from (select DISTINCT product_code from pro_order_workorder where parent_order = '0' and del_flag = '0'
 			and status in('w2','w3')
@@ -1105,7 +1105,6 @@ WHERE
 		    ) pow
 			 left join base_product bp on pow.product_code = bp.product_code
 			 left join base_product_attached bpa on concat('0000000',bpa.product_code) = bp.product_code
-			 left join mes_box mb on mb.box_type = bp.box_type
 			 left join lanju_op_cloud.dbo.sys_dict_data dict on dict.dict_value = bpa.cpk_type and dict.dict_type= 'qms_category'
 		where bp.del_flag = '0'
 		  and (bp.product_code like '00000001%' or bp.product_code like '00000002%' or bp.product_code like '00000003%'

op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java

@@ -304,17 +304,17 @@ public class ProOrderWorkorderController extends BaseController {
     public AjaxResult downWorkorder(@PathVariable String[] workorderIds) {
         List<BaseProduct> packageTypes = proOrderWorkorderService.getPackType(workorderIds);
         if(CollectionUtils.isEmpty(packageTypes)){
-            return AjaxResult.error("请先维护垛型箱型！");
+            return AjaxResult.error("请先维护所选产品的垛型和长宽高！");
         }else{
             for(BaseProduct ptype:packageTypes){
                 if(ptype == null){
-                    return AjaxResult.error("请先维护垛型箱型！");
+                    return AjaxResult.error("请先维护"+ptype.getProductDescZh()+"("+ptype.getProductCode().substring(7)+")垛型和长宽高！");
                 }
                 if(StringUtils.isEmpty(ptype.getBoxType())){
-                    return AjaxResult.error("请先维护箱型！");
+                    return AjaxResult.error("请先维护"+ptype.getProductDescZh()+"("+ptype.getProductCode().substring(7)+")箱型尺寸！");
                 }
                 if(StringUtils.isEmpty(ptype.getPackType())){
-                    return AjaxResult.error("请先维护垛型！");
+                    return AjaxResult.error("请先维护"+ptype.getProductDescZh()+"("+ptype.getProductCode().substring(7)+")垛型！");
                 }
             }
         }
@@ -397,4 +397,9 @@ public class ProOrderWorkorderController extends BaseController {
         int m = proOrderWorkorderService.updateWorkOrderBom(workorderCode);
         return toAjax(m);
     }
+
+    public static void main(String args[]){
+        String m = "000000010101000115";
+        System.out.println(m.substring(7));
+    }
 }

op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml

@@ -1124,6 +1124,7 @@
     </select>
     <select id="getPackType" resultType="com.op.plan.domain.BaseProduct">
         select
+        pow.product_code productCode,pow.product_name productDescZh,
         bp.box_type boxType,
         bpa.pack_type packType
         from pro_order_workorder pow

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java

@@ -313,6 +313,13 @@ public class QcProCheckServiceImpl implements QcProCheckService {
         String status = "N";
         int nookNum = 0;
         for(String aValue:qcCheckTaskDetail.getActualValues()){
+            if(aValue.indexOf(":")>0&&StringUtils.isNotBlank(aValue.split(":")[1])){
+                aValue = aValue.split(":")[1];
+            }else{
+                aValue = "0";
+            }
+
+
             if(qcCheckTaskDetail.getUpperDiff()!=null && qcCheckTaskDetail.getDownDiff()!=null
             && qcCheckTaskDetail.getDownDiff().compareTo(new BigDecimal(aValue)) < 1
             && qcCheckTaskDetail.getUpperDiff().compareTo(new BigDecimal(aValue)) >=0){

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java

@@ -1324,7 +1324,11 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
                         for(String avg:actArray0){
                             if(avg.matches(".*\\..*\\..*")||avg.indexOf(":")>0){
                                 if(!StringUtils.isEmpty(avg.substring(2))&&!"0".equals(avg.substring(2))){
-                                    actArray.add(avg.substring(2));
+                                    if(avg.indexOf(":")>0&&StringUtils.isNotBlank(avg.split(":")[1])){
+                                        actArray.add(avg.split(":")[1]);
+                                    }else{
+                                        actArray.add(avg.substring(2));
+                                    }
                                 }
                             }else if(StringUtils.isNotEmpty(avg)){
                                 actArray.add(avg);