问题修复24

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

@@ -9,10 +9,9 @@ import javax.servlet.http.HttpServletResponse;
 import com.alibaba.fastjson2.JSONObject;
 import com.op.common.core.domain.ExcelCol;
 import com.op.common.core.exception.ServiceException;
+import com.op.common.core.utils.StringUtils;
 import com.op.common.core.utils.poi.ExcelMapUtil;
-import com.op.plan.domain.ProLine;
-import com.op.plan.domain.ProOrder;
-import com.op.plan.domain.ProOrderWorkorderBatch;
+import com.op.plan.domain.*;
 import com.op.plan.domain.dto.SplitOrderDTO;
 import com.op.plan.service.IProWetMaterialPlanDetailService;
 import com.op.plan.service.IProWetMaterialPlanService;
@@ -32,7 +31,6 @@ import org.springframework.web.bind.annotation.RestController;
 import com.op.common.log.annotation.Log;
 import com.op.common.log.enums.BusinessType;
 import com.op.common.security.annotation.RequiresPermissions;
-import com.op.plan.domain.ProOrderWorkorder;
 import com.op.plan.service.IProOrderWorkorderService;
 import com.op.common.core.web.controller.BaseController;
 import com.op.common.core.web.domain.AjaxResult;
@@ -304,6 +302,19 @@ public class ProOrderWorkorderController extends BaseController {
     @Log(title = "下发生产工单", businessType = BusinessType.OTHER)
     @PostMapping("/downWorkorder/{workorderIds}")
     public AjaxResult downWorkorder(@PathVariable String[] workorderIds) {
+        List<BaseProduct> packageTypes = proOrderWorkorderService.getPackType(workorderIds);
+        if(CollectionUtils.isEmpty(packageTypes)){
+            return AjaxResult.error("请先维护垛型箱型！");
+        }else{
+            for(BaseProduct ptype:packageTypes){
+                if(StringUtils.isEmpty(ptype.getBoxType())){
+                    return AjaxResult.error("请先维护箱型！");
+                }
+                if(StringUtils.isEmpty(ptype.getPackType())){
+                    return AjaxResult.error("请先维护垛型！");
+                }
+            }
+        }
         List<String> orderNotW0 = proOrderWorkorderService.getOrderNotW0(workorderIds);
         if(workorderIds.length != orderNotW0.size()){
             return AjaxResult.error("存在已经派发的订单，请重新选择工单！");

op-modules/op-plan/src/main/java/com/op/plan/domain/BaseProduct.java

@@ -10,6 +10,24 @@ public class BaseProduct {
     private String mtart;
     private BigDecimal batchQuaStandar;
     private BigDecimal umrez;
+    private String boxType;
+    private String packType;
+
+    public String getBoxType() {
+        return boxType;
+    }
+
+    public void setBoxType(String boxType) {
+        this.boxType = boxType;
+    }
+
+    public String getPackType() {
+        return packType;
+    }
+
+    public void setPackType(String packType) {
+        this.packType = packType;
+    }
 
     public BigDecimal getBatchQuaStandar() {
         return batchQuaStandar;

op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java

@@ -266,5 +266,7 @@ public interface ProOrderWorkorderMapper {
     String getPlanLineCodes(String workorderId);
 
     List<ProOrderWorkorder> getBPNBomList(ProOrderWorkorder proOrderWorkorder);
+
+    List<BaseProduct> getPackType(@Param("workorderCodes")String[] workorderCodes);
 }
 

op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java

@@ -2,10 +2,7 @@ package com.op.plan.service;
 
 
 import com.op.common.core.web.domain.AjaxResult;
-import com.op.plan.domain.ProLine;
-import com.op.plan.domain.ProOrder;
-import com.op.plan.domain.ProOrderWorkorder;
-import com.op.plan.domain.ProOrderWorkorderBatch;
+import com.op.plan.domain.*;
 import com.op.plan.domain.dto.SplitOrderDTO;
 
 import java.util.HashMap;
@@ -163,4 +160,6 @@ public interface IProOrderWorkorderService {
     List<HashMap> getPowExportData(ProOrderWorkorder proOrderWorkorder);
 
     List<ProOrderWorkorder> getBPNBomList(ProOrderWorkorder proOrderWorkorder);
+
+    List<BaseProduct> getPackType(String[] workorderIds);
 }

op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java

@@ -1119,6 +1119,12 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
         return proOrderWorkorderMapper.getOrderNotW0(workorderIds);
     }
 
+    @Override
+    @DS("#header.poolName")
+    public List<BaseProduct> getPackType(String[] workorderIds) {
+        return proOrderWorkorderMapper.getPackType(workorderIds);
+    }
+
     @Override
     @DS("#header.poolName")
     public int deleteWetMaterial(String[] workorderIds) {
@@ -1224,7 +1230,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
             batch.setBatchCode(batchCode);
             batch.setNewBatchCode(newBatchCode);
 
-            batch.setStatus("1");//1代表未报工
+            //batch.setStatus("1");//1代表未报工
             batch.setUpdateBy(username);
             batch.setUpdateTime(DateUtils.getNowDate());
 

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

@@ -1122,5 +1122,19 @@
         )
         order by bom.product_code
     </select>
+    <select id="getPackType" resultType="com.op.plan.domain.BaseProduct">
+        select
+        bp.box_type boxType,
+        bpa.pack_type packType
+        from pro_order_workorder pow
+        left join base_product bp on bp.product_code = pow.product_code and bp.del_flag = '0'
+        left join base_product_attached bpa on concat('0000000',bpa.product_code) = pow.product_code
+        where pow.workorder_code in
+        <foreach item="workorderCode" collection="workorderCodes" open="(" separator="," close=")">
+            #{workorderCode}
+        </foreach>
+        and pow.status in ('w0')
+        and pow.del_flag = '0'
+    </select>
 
 </mapper>

op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java

@@ -589,9 +589,9 @@ public class QcCheckTaskIncomeController extends BaseController {
         return rlist;
     }
 
-    /**照片提交**/
-    @PutMapping(value = "/submitInspectionPhotos")
-    public AjaxResult submitInspectionPhotos(@RequestBody QcCheckTaskIncome qcCheckTaskIncome) {
-        return toAjax(qcCheckTaskIncomeService.insertBaseFileBatch(qcCheckTaskIncome));
+    /**检验图片提交**/
+    @PutMapping(value = "/submitCheckPics")
+    public AjaxResult submitCheckPics(@RequestBody QcCheckTaskIncome qcCheckTaskIncome) {
+        return toAjax(qcCheckTaskIncomeService.submitCheckPics(qcCheckTaskIncome));
     }
 }

op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java

@@ -123,5 +123,5 @@ public interface IQcCheckTaskIncomeService {
 
     List<Map> getCkeckProjectMapList(QcCheckTaskIncome qcCheckTaskIncome);
 
-    int insertBaseFileBatch(QcCheckTaskIncome qcCheckTaskIncome);
+    int submitCheckPics(QcCheckTaskIncome qcCheckTaskIncome);
 }

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

@@ -1440,10 +1440,10 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 
 	@Override
 	@DS("#header.poolName")
-	public int insertBaseFileBatch(QcCheckTaskIncome qcCheckTaskIncome) {
+	public int submitCheckPics(QcCheckTaskIncome qcCheckTaskIncome) {
 		qcCheckTaskIncomeMapper.deleteBaseFileBySourceId(qcCheckTaskIncome.getRecordId());
 		List<BaseFileData> files = new ArrayList<>();
-		if (com.op.common.core.utils.StringUtils.isNotEmpty(qcCheckTaskIncome.getFileList())) {
+		if (StringUtils.isNotEmpty(qcCheckTaskIncome.getFileList())) {
 			String[] ids = qcCheckTaskIncome.getFileList().split(",");
 			BaseFileData file = null;
 			for (String id : ids) {