From 9971a509bc396d6cad08c5da034b8795d7876098 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 28 Dec 2023 09:29:24 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=89=8B=E6=8C=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/quality/QcCheckTaskIncomeMapper.xml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml index 386a4340..4548caef 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml @@ -322,12 +322,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into qc_check_task_user( From d6d6d33110308373619bbd37d39d8d96e8eb7f02 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 28 Dec 2023 10:32:40 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=89=8B=E6=8C=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/QcCheckTaskIncomeMapper.java | 2 ++ .../impl/QcCheckTaskIncomeServiceImpl.java | 1 + .../service/impl/QcProCheckServiceImpl.java | 4 ++++ .../quality/QcCheckTaskIncomeMapper.xml | 19 +++++++++++++------ 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java index aadd15b1..85071716 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java @@ -94,4 +94,6 @@ public interface QcCheckTaskIncomeMapper { int addQcCheckTaskDefects(@Param("list") List defects); List getCkeckDefectList(QcCheckTaskDetail qcCheckTaskDetail); + + List getDefectType(QcCheckTaskDetail qcCheckTaskDetail); } 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 10f2870c..248906d9 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 @@ -484,6 +484,7 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { defect.setCreateTime(nowTime); defect.setCreateBy(updateBy); defect.setFactoryCode(factoryCode); + defect.setBelongTo(belongId); noOkQquality = noOkQquality.add(defect.getNoOkQuality()); } qcCheckTask.setNoOkQuality(noOkQquality);//累计不合格数 diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java index b9a2a1c6..daee7bf0 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java @@ -1,5 +1,6 @@ package com.op.quality.service.impl; +import com.alibaba.nacos.common.utils.CollectionUtils; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.op.common.core.domain.BaseFileData; @@ -126,6 +127,9 @@ public class QcProCheckServiceImpl implements QcProCheckService { List qcCheckTaskDetails =qcCheckTaskIncomeMapper.getCkeckProjectList(qcCheckTaskDetail); dto.setQcCheckTaskDetails(qcCheckTaskDetails); List defects =qcCheckTaskIncomeMapper.getCkeckDefectList(qcCheckTaskDetail); + if(CollectionUtils.isEmpty(defects)){ + defects =qcCheckTaskIncomeMapper.getDefectType(qcCheckTaskDetail); + } dto.setDefects(defects); return dto; } diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml index 4548caef..8cb572ac 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml @@ -323,14 +323,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + insert into qc_check_task_user( From 81bec3822e506d2aa241e3393cf9e9f6446f9cd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=9D=B0?= <2658502433@qq.com> Date: Thu, 28 Dec 2023 11:39:32 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=99=BD=E5=9D=AF=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/plan/controller/ProBPOrderWorkorderController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProBPOrderWorkorderController.java b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProBPOrderWorkorderController.java index 50d1d653..5b791813 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProBPOrderWorkorderController.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProBPOrderWorkorderController.java @@ -103,7 +103,7 @@ public class ProBPOrderWorkorderController extends BaseController { /** * 查询生产工单列表 */ - @RequiresPermissions("mes:bppro:proworkorder:list") + @RequiresPermissions("mes:bppro:workorder:list") @GetMapping("/list") public TableDataInfo list(ProOrderWorkorder proOrderWorkorder) { startPage(); From 166d5d6c01494cfdbc776ce3698bce3dc9a6acd0 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Thu, 28 Dec 2023 14:12:30 +0800 Subject: [PATCH 4/6] =?UTF-8?q?wms=E4=BF=AE=E6=94=B910?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OdsProcureOutOrderController.java | 16 ++++++++++-- .../wms/mapper/OdsProcureOutOrderMapper.java | 4 +++ .../service/IOdsProcureOutOrderService.java | 4 +++ .../impl/OdsProcureOutOrderServiceImpl.java | 13 ++++++++++ .../mapper/wms/OdsProcureOutOrderMapper.xml | 26 +++++++++++++++++-- 5 files changed, 59 insertions(+), 4 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOutOrderController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOutOrderController.java index 3f295484..fefde950 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOutOrderController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOutOrderController.java @@ -23,7 +23,7 @@ import com.op.common.core.web.page.TableDataInfo; /** * 包材出库单Controller - * + * * @author Open Platform * @date 2023-07-06 */ @@ -39,11 +39,23 @@ public class OdsProcureOutOrderController extends BaseController { @RequiresPermissions("wms:outorder:list") @GetMapping("/list") public TableDataInfo list(OdsProcureOutOrder odsProcureOutOrder) { - startPage(); +// startPage(); List list = odsProcureOutOrderService.selectOdsProcureOutOrderList(odsProcureOutOrder); return getDataTable(list); } + @PostMapping("/listZU") + public TableDataInfo listZU(OdsProcureOutOrder odsProcureOutOrder) { + startPage(); + List list = odsProcureOutOrderService.selectOdsProcureOutOrderListZU(odsProcureOutOrder); + for (OdsProcureOutOrder odsProcureOutOrder1: + list) { + List orderList1= odsProcureOutOrderService.selectOdsProcureOutOrderListZUTwo(odsProcureOutOrder1); + odsProcureOutOrder1.setList(orderList1); + } + + return getDataTable(list); + } /** * 导出包材出库单列表 */ diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java index d48005bf..e318ab39 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java @@ -69,4 +69,8 @@ public interface OdsProcureOutOrderMapper { void updateOdsProcureOutOrderByid(OdsProcureOutOrder odsProcureOutOrder); List selectOdsProcureOutOrderListByIds(@Param("list") List orderList); + + List selectOdsProcureOutOrderListZU(OdsProcureOutOrder odsProcureOutOrder); + + List selectOdsProcureOutOrderListZUT(OdsProcureOutOrder odsProcureOutOrder1); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOutOrderService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOutOrderService.java index 774b7648..12fb2b9c 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOutOrderService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOutOrderService.java @@ -57,4 +57,8 @@ public interface IOdsProcureOutOrderService { * @return 结果 */ public int deleteOdsProcureOutOrderByID(String ID); + + List selectOdsProcureOutOrderListZU(OdsProcureOutOrder odsProcureOutOrder); + + List selectOdsProcureOutOrderListZUTwo(OdsProcureOutOrder odsProcureOutOrder1); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java index 31042c3a..dea9ac4c 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java @@ -1,5 +1,6 @@ package com.op.wms.service.impl; +import java.util.ArrayList; import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; @@ -91,4 +92,16 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService public int deleteOdsProcureOutOrderByID(String ID) { return odsProcureOutOrderMapper.deleteOdsProcureOutOrderByID(ID); } + + @Override + public List selectOdsProcureOutOrderListZU(OdsProcureOutOrder odsProcureOutOrder) { + + return odsProcureOutOrderMapper.selectOdsProcureOutOrderListZU(odsProcureOutOrder); + } + + @Override + public List selectOdsProcureOutOrderListZUTwo(OdsProcureOutOrder odsProcureOutOrder1) { + List orderList= odsProcureOutOrderMapper.selectOdsProcureOutOrderListZUT(odsProcureOutOrder1); + return orderList; + } } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml index 5e69ab7d..1267b32b 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml @@ -40,11 +40,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + limit #{page.pageOffset} , #{page.rows} + select Site_code, ID, Produce_Code, Material_Code, Material_Desc, Plan_Date, Plan_Number, Unit, COALESCE(Out_Number, 0) as Out_Number , Loc_Code, Loc_Desc, Production_Line_Desc, Production_Line_Code, Order_Status, User_Defined1, User_Defined2, User_Defined3, User_Defined4, User_Defined5, User_Defined6, User_Defined7, User_Defined8, User_Defined9, User_Defined10, User_Defined11, Supplier_Code, Supplier_Name, Create_By, Create_Date, Last_Update_By, Last_Update_Date, Active, Enterprise_Id, Enterprise_Code from ods_procure_out_order - + + + From db0974704230444d10ff604c5c24df1cb95aed13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=9D=B0?= <2658502433@qq.com> Date: Thu, 28 Dec 2023 16:00:04 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=88=90=E5=93=81=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/wms/domain/WmsProductPut.java | 81 +++++++++---------- .../mapper/wms/WmsProductPutMapper.xml | 14 ++-- 2 files changed, 47 insertions(+), 48 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPut.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPut.java index 3989bc36..1d42825b 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPut.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPut.java @@ -97,8 +97,8 @@ public class WmsProductPut extends BaseEntity { private String batchNumber; /** 预留字段2 */ - @Excel(name = "预留字段2") - private String attr2; + @Excel(name = "生产日期") + private String productDate; /** 预留字段3 */ @Excel(name = "预留字段3") @@ -272,13 +272,16 @@ public class WmsProductPut extends BaseEntity { public String getBatchNumber() { return batchNumber; } - public void setAttr2(String attr2) { - this.attr2 = attr2; + + + public String getProductDate() { + return productDate; } - public String getAttr2() { - return attr2; + public void setProductDate(String productDate) { + this.productDate = productDate; } + public void setAttr3(String attr3) { this.attr3 = attr3; } @@ -338,40 +341,36 @@ public class WmsProductPut extends BaseEntity { @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("workOrder", getWorkOrder()) - .append("factoryCode", getFactoryCode()) - .append("productOrder", getProductOrder()) - .append("whCode", getWhCode()) - .append("waCode", getWaCode()) - .append("wlCode", getWlCode()) - .append("productName", getProductName()) - .append("productCode", getProductCode()) - .append("productSort", getProductSort()) - .append("specification", getSpecification()) - .append("unitOfMeasure", getUnitOfMeasure()) - .append("planQuantity", getPlanQuantity()) - .append("putQuantity", getPutQuantity()) - .append("status", getStatus()) - .append("sapStatus", getSapStatus()) - .append("sapProof", getSapProof()) - .append("sapMessage", getSapMessage()) - .append("putDate", getPutDate()) - .append("batchNumber", getBatchNumber()) - .append("attr2", getAttr2()) - .append("attr3", getAttr3()) - .append("attr4", getAttr4()) - .append("attr5", getAttr5()) - .append("attr6", getAttr6()) - .append("attr7", getAttr7()) - .append("attr8", getAttr8()) - .append("attr9", getAttr9()) - .append("attr10", getAttr10()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); + return "WmsProductPut{" + + "id='" + id + '\'' + + ", workOrder='" + workOrder + '\'' + + ", factoryCode='" + factoryCode + '\'' + + ", productOrder='" + productOrder + '\'' + + ", whCode='" + whCode + '\'' + + ", waCode='" + waCode + '\'' + + ", wlCode='" + wlCode + '\'' + + ", productName='" + productName + '\'' + + ", productCode='" + productCode + '\'' + + ", productSort='" + productSort + '\'' + + ", specification='" + specification + '\'' + + ", unitOfMeasure='" + unitOfMeasure + '\'' + + ", planQuantity=" + planQuantity + + ", putQuantity=" + putQuantity + + ", status='" + status + '\'' + + ", sapStatus='" + sapStatus + '\'' + + ", sapProof='" + sapProof + '\'' + + ", sapMessage='" + sapMessage + '\'' + + ", putDate=" + putDate + + ", batchNumber='" + batchNumber + '\'' + + ", product_date='" + productDate + '\'' + + ", attr3='" + attr3 + '\'' + + ", attr4='" + attr4 + '\'' + + ", attr5='" + attr5 + '\'' + + ", attr6='" + attr6 + '\'' + + ", attr7='" + attr7 + '\'' + + ", attr8='" + attr8 + '\'' + + ", attr9='" + attr9 + '\'' + + ", attr10='" + attr10 + '\'' + + '}'; } } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml index 7be217f4..7f333af1 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml @@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, work_order, factory_code, product_order, wh_code, wa_code, wl_code, product_name, product_code, product_sort, specification, unit_of_measure, plan_quantity, put_quantity, status, SAP_status, SAP_proof, SAP_message, put_date, batch_number, attr2, attr3, attr4, attr5, attr6, attr7, attr8, attr9, attr10, create_by, create_time, update_by, update_time from wms_product_put + select id, work_order, factory_code, product_order, wh_code, wa_code, wl_code, product_name, product_code, product_sort, specification, unit_of_measure, plan_quantity, put_quantity, status, SAP_status, SAP_proof, SAP_message, put_date, batch_number, product_date, attr3, attr4, attr5, attr6, attr7, attr8, attr9, attr10, create_by, create_time, update_by, update_time from wms_product_put SELECT factory_code,product_order,wh_code,wa_code,wl_code,product_name,product_code,product_sort,specification, - unit_of_measure,plan_quantity,put_quantity,status,SAP_status,SAP_proof,SAP_message,put_date,batch_number,attr2, + unit_of_measure,plan_quantity,put_quantity,status,SAP_status,SAP_proof,SAP_message,put_date,batch_number,product_date, attr3,attr4,attr5,attr6,attr7,attr8,attr9,attr10,create_by,create_time, update_by,update_time,id FROM @@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SAP_message, put_date, batch_number, - attr2, + product_date, attr3, attr4, attr5, @@ -153,7 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{sapMessage}, #{putDate}, #{batch_number}, - #{attr2}, + #{product_date}, #{attr3}, #{attr4}, #{attr5}, @@ -191,7 +191,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SAP_message = #{sapMessage}, put_date = #{putDate}, batch_number = #{batchNumber}, - attr2 = #{attr2}, + product_date = #{productDate}, attr3 = #{attr3}, attr4 = #{attr4}, attr5 = #{attr5}, From 1211472ae4d10360df5d6bec303855d08020f9a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=9D=B0?= <2658502433@qq.com> Date: Thu, 28 Dec 2023 16:37:37 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E7=99=BD=E5=9D=AF=E5=85=A5=E5=BA=93=E5=8D=951?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/quality/service/impl/WmsRawOrderInServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/WmsRawOrderInServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/WmsRawOrderInServiceImpl.java index af35158e..6ac1d836 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/WmsRawOrderInServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/WmsRawOrderInServiceImpl.java @@ -64,6 +64,7 @@ public class WmsRawOrderInServiceImpl implements IWmsRawOrderInService { wmsRawOrderIn.setActiveFlag("1"); wmsRawOrderIn.setSupplyCode("0000102874"); wmsRawOrderIn.setSapFactoryCode("1000"); + wmsRawOrderIn.setQualityStatus("0"); return wmsRawOrderInMapper.insertWmsRawOrderIn(wmsRawOrderIn); }