From 8a531dd2fd1431a411e24821a4afdb8e50a8a8ca Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 12 Dec 2024 14:38:53 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D24?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProOrderWorkorderController.java | 19 +++++++++++++++---- .../java/com/op/plan/domain/BaseProduct.java | 18 ++++++++++++++++++ .../plan/mapper/ProOrderWorkorderMapper.java | 2 ++ .../service/IProOrderWorkorderService.java | 7 +++---- .../impl/ProOrderWorkorderServiceImpl.java | 8 +++++++- .../mapper/plan/ProOrderWorkorderMapper.xml | 14 ++++++++++++++ .../QcCheckTaskIncomeController.java | 8 ++++---- .../service/IQcCheckTaskIncomeService.java | 2 +- .../impl/QcCheckTaskIncomeServiceImpl.java | 4 ++-- 9 files changed, 66 insertions(+), 16 deletions(-) diff --git a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java index cb30c426..264308e0 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java +++ b/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 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 orderNotW0 = proOrderWorkorderService.getOrderNotW0(workorderIds); if(workorderIds.length != orderNotW0.size()){ return AjaxResult.error("存在已经派发的订单，请重新选择工单！"); diff --git a/op-modules/op-plan/src/main/java/com/op/plan/domain/BaseProduct.java b/op-modules/op-plan/src/main/java/com/op/plan/domain/BaseProduct.java index 6059b47b..49564246 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/domain/BaseProduct.java +++ b/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; diff --git a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java index 2e024772..2ec2c23d 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java +++ b/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 getBPNBomList(ProOrderWorkorder proOrderWorkorder); + + List getPackType(@Param("workorderCodes")String[] workorderCodes); } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java b/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java index 0d5d540b..27073204 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java +++ b/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 getPowExportData(ProOrderWorkorder proOrderWorkorder); List getBPNBomList(ProOrderWorkorder proOrderWorkorder); + + List getPackType(String[] workorderIds); } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java index 93941b44..51eadee7 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java +++ b/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 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()); diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml index bdb69452..becc0ade 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml @@ -1122,5 +1122,19 @@ ) order by bom.product_code + diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java index 2c63a1c4..f817d8a5 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java +++ b/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)); } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java index 1632036c..1a45aea5 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java @@ -123,5 +123,5 @@ public interface IQcCheckTaskIncomeService { List getCkeckProjectMapList(QcCheckTaskIncome qcCheckTaskIncome); - int insertBaseFileBatch(QcCheckTaskIncome qcCheckTaskIncome); + int submitCheckPics(QcCheckTaskIncome qcCheckTaskIncome); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java index 549e7f89..0ef93b9e 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java @@ -1440,10 +1440,10 @@ public class QcCheckTaskIncomeServiceImpl implements @Override @DS("#header.poolName") - public int insertBaseFileBatch(QcCheckTaskIncome qcCheckTaskIncome) { + public int submitCheckPics(QcCheckTaskIncome qcCheckTaskIncome) { qcCheckTaskIncomeMapper.deleteBaseFileBySourceId(qcCheckTaskIncome.getRecordId()); List 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) {