From c4cbcd16dd18cb340f5cc5a5b13d13ff8c6dfbe9 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 8 Aug 2024 14:35:02 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=93=81=E8=B4=A8oa=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java index 8f6814295..451470d2a 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java @@ -346,7 +346,7 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService mainObject.append("\"CPMC\":"+"\""+detailInfo.getMaterialName()+"\"");//产品名称 mainObject.append(",\"CPBM\":"+"\""+detailInfo.getMaterialCode()+"\"");//产品编码 mainObject.append(",\"SQBM\":"+"\""+task.getSqbm()+"\"");//0品质保障部 - mainObject.append(",\"SQR\":"+"\""+task.getSqr()+"\"");//申请人:默认当前用户 + mainObject.append(",\"SQR\":"+"\""+task.getPgzg()+"\"");//申请人:默认当前用户 mainObject.append(",\"SQSJ\":"+"\""+DateUtils.parseDateToStr("yyyy-MM-dd",detailInfo.getCheckTime())+"\"");//申请时间 mainObject.append(",\"SCCJ\":"+"\""+task.getSccj()+"\"");//所属车间 mainObject.append(",\"SCPH\":"+"\""+detailInfo.getIncomeBatchNo()+"\"");//生产批号 From dd1a8dc05495ad60c3983473018c4ebafc20cc46 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 8 Aug 2024 16:33:15 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E5=93=81=E8=B4=A8oa=E6=B5=81=E7=A8=8B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java | 2 +- .../quality/service/impl/QcCheckUnqualifiedServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 17eba19cc..6a7e1cbb8 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 @@ -817,7 +817,7 @@ public class QcCheckTaskIncomeServiceImpl implements if("produce".equals(qcCheckTaskIncome.getTypeCode())){ unqualified.setTypeCode(qcCheckTaskIncome.getTypeCode()); unqualified.setSfgyswt(qcCheckTaskIncome.getSfgyswt()); - unqualified.setUser(qcCheckTaskIncome.getUpdateBy()); + unqualified.setUser(qcCheckTaskIncome.getPgzg());//qcCheckTaskIncome.getUpdateBy(); //申请人- unqualified.setSqr("MSL#"+qcCheckTaskIncome.getSqr()); //申请部门 diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java index 451470d2a..12c314bbc 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java @@ -336,7 +336,7 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService QcCheckTaskIncome detailInfo = qcCheckTaskIncomeMapper.getTaskInfo(task.getTaskId()); //发起来料检验OA流程 Map paramMap = new HashMap<>(); - paramMap.put("user",task.getUser());//提交人工号 + paramMap.put("user",task.getUser());//提交人工号; paramMap.put("requestLevel",0);//流程紧急度 paramMap.put("requestName","ZL0030-品质异常流程-智能制造-"+DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",detailInfo.getIncomeTime())+"（产品名称:"+detailInfo.getMaterialName()+"）");//流程名称 paramMap.put("workflowId",113455);//该流程对应的唯- workFlowld @@ -346,7 +346,7 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService mainObject.append("\"CPMC\":"+"\""+detailInfo.getMaterialName()+"\"");//产品名称 mainObject.append(",\"CPBM\":"+"\""+detailInfo.getMaterialCode()+"\"");//产品编码 mainObject.append(",\"SQBM\":"+"\""+task.getSqbm()+"\"");//0品质保障部 - mainObject.append(",\"SQR\":"+"\""+task.getPgzg()+"\"");//申请人:默认当前用户 + mainObject.append(",\"SQR\":"+"\""+task.getSqr()+"\"");//申请人:默认当前用户 mainObject.append(",\"SQSJ\":"+"\""+DateUtils.parseDateToStr("yyyy-MM-dd",detailInfo.getCheckTime())+"\"");//申请时间 mainObject.append(",\"SCCJ\":"+"\""+task.getSccj()+"\"");//所属车间 mainObject.append(",\"SCPH\":"+"\""+detailInfo.getIncomeBatchNo()+"\"");//生产批号 From db912976940871dd4850dd316a397f145cb210f1 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Thu, 8 Aug 2024 17:18:45 +0800 Subject: [PATCH 03/12] =?UTF-8?q?wms=E6=A0=87=E8=AF=86=E5=8D=A1=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=EF=BC=8C=E9=87=87=E8=B4=AD=E5=8D=95bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WmsToWCSmissionController.java | 2 +- .../com/op/wms/domain/OdsProcureOrder.java | 2 +- .../com/op/wms/domain/WmsLogotypeTable.java | 63 +++++++++++++++++++ .../op/wms/mapper/WmsRawOrderInSnMapper.java | 7 +-- .../impl/OdsProcureOrderServiceImpl.java | 35 +++++++---- .../impl/WmsProductPutServiceImpl.java | 1 + .../impl/WmsProductPutTrayServiceImpl.java | 49 ++++++++------- .../mapper/wms/WmsRawOrderInSnMapper.xml | 15 +++++ 8 files changed, 132 insertions(+), 42 deletions(-) create mode 100644 op-modules/op-wms/src/main/java/com/op/wms/domain/WmsLogotypeTable.java diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java index 1751ad7d7..83a049aa0 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java @@ -113,7 +113,7 @@ public class WmsToWCSmissionController { } /** - * 手持 －－包材采购单采购收货确认操作 + * 手持 －－包材采购单采购收货确认操作--我们把入库砍掉了，你这个就是入库操作了 */ @PostMapping("/PurchaseOrderdeliPdaConfirm") diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOrder.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOrder.java index b11e9db44..0eb96bde0 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOrder.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOrder.java @@ -233,7 +233,7 @@ public class OdsProcureOrder extends BaseEntity { private String userDefined7; /** - * 用户自定义属性8 + * 用户自定义属性8--判断是用采购单还是送货单获取的 */ @Excel(name = "用户自定义属性8") private String userDefined8; diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsLogotypeTable.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsLogotypeTable.java new file mode 100644 index 000000000..a4d1f7b6b --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsLogotypeTable.java @@ -0,0 +1,63 @@ +package com.op.wms.domain; + +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; + +public class WmsLogotypeTable extends BaseEntity { + private static final long serialVersionUID = 1L; + /** + * 唯一序列 + */ + @Excel(name = "唯一序列") + private String id; + + /** + * 仓库编码 + */ + @Excel(name = "仓库编码") + private String logotype; + + /** + * 区域编号 + */ + @Excel(name = "区域编号") + private String sn; + + /** + * 库区编码 + */ + @Excel(name = "库区编码") + private String activeFlag; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLogotype() { + return logotype; + } + + public void setLogotype(String logotype) { + this.logotype = logotype; + } + + public String getSn() { + return sn; + } + + public void setSn(String sn) { + this.sn = sn; + } + + public String getActiveFlag() { + return activeFlag; + } + + public void setActiveFlag(String activeFlag) { + this.activeFlag = activeFlag; + } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInSnMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInSnMapper.java index 5d34d5a77..51766dd54 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInSnMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInSnMapper.java @@ -2,10 +2,7 @@ package com.op.wms.mapper; import java.util.List; -import com.op.wms.domain.OdsProcureOrder; -import com.op.wms.domain.WCSInventoryPlan; -import com.op.wms.domain.WmsRawOrderInSn; -import com.op.wms.domain.WmsToWCSDTO; +import com.op.wms.domain.*; /** * 原材料收货明细Mapper接口 @@ -68,4 +65,6 @@ public interface WmsRawOrderInSnMapper { List selecPurchaseOrderdeliPdaList(OdsProcureOrder odsProcureOrder); + + void insertWmsLogotypeTable(WmsLogotypeTable wmsLogotypeTable); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java index dcfc7c2ca..6f1358314 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java @@ -181,7 +181,19 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { wmsRawOrderInSn.setFactoryCode(odsProcureOrder.getSiteCode()); wmsRawOrderInSn.setUserDefined3(order.getID()); wmsRawOrderInSn.setUserDefined5(odsProcureOrder.getReceiptNoCode()); + wmsRawOrderInSn.setUserDefined6(odsProcureOrder.getUserDefined6());//标识码绑定 + wmsRawOrderInSnMapper.insertWmsRawOrderInSn(wmsRawOrderInSn); + //标识码绑定 + if (odsProcureOrder.getUserDefined6()!=null){ + WmsLogotypeTable wmsLogotypeTable=new WmsLogotypeTable(); + wmsLogotypeTable.setId(IdUtils.fastSimpleUUID()); + wmsLogotypeTable.setLogotype(odsProcureOrder.getUserDefined6()); + wmsLogotypeTable.setSn(odsProcureOrder.getSn()); + wmsLogotypeTable.setActiveFlag("1"); + wmsRawOrderInSnMapper.insertWmsLogotypeTable(wmsLogotypeTable); + } + //插入收货记录 //如果收货完成了的话，就插入信息收货完成 odsProcureOrder.setOrderStatus("1"); @@ -668,6 +680,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { order.setUserDefined3(sapPurchaseOrderQuery1.get("ebelp"));//批次 order.setMaterialCode(sapPurchaseOrderQuery1.get("matnr")); order.setMaterialDesc(sapPurchaseOrderQuery1.get("maktx")); + order.setUserDefined8("1"); order.setActive("1"); List orderList = odsProcureOrderMapper.selectOdsProcureOrderList(order); if (orderList.size() > 0) { @@ -728,6 +741,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { String result="操作成功"; List wmsRawOrderInSn = wmsRawOrderInSnMapper.selecPurchaseOrderdeliPdaList(odsProcureOrder); + return result; } @@ -786,6 +800,8 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode()); SapPurchaseOrderQuery sapPurchaseOrderQuery = new SapPurchaseOrderQuery(); sapPurchaseOrderQuery.setEbeln(odsProcureOrder.getProcureCode());//采购单号 + //"ebelp": "10", + //代表是-00010 Map paramMap=new HashMap<>(); paramMap.put("id",odsProcureOrder.getUserDefined5()); AjaxResult result = remoteOpenService.getDeliveryNoteDetail(paramMap); @@ -804,30 +820,26 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { } order.setProcureCode(sapPurchaseOrderQuery1.get("orderNum")); order.setSiteCode(sapPurchaseOrderQuery1.get("werks")); - //order.setUserDefined3(sapPurchaseOrderQuery1.get("ebelp"));//批次 + order.setUserDefined3(sapPurchaseOrderQuery1.get("ebelp"));//批次 + if (order.getUserDefined3()!=null){ + order.setUserDefined3("000"+order.getUserDefined3()); + } String materialCode = sapPurchaseOrderQuery1.get("matnr"); materialCode = "0000000" + materialCode; order.setMaterialCode(materialCode); -// order.setMaterialCode(sapPurchaseOrderQuery1.get("matnr")); -// order.setMaterialCode("0000000"+order.getMaterialCode()); + order.setUserDefined5(mainId);//送货单 order.setMaterialDesc(sapPurchaseOrderQuery1.get("matnrName")); order.setActive("1"); + order.setUserDefined8("0");//0是属于送货单下的 List orderList = odsProcureOrderMapper.selectOdsProcureOrderList(order); if (orderList.size() > 0) { //这个地方判断下是不是采购单已经被插入了，如果是的话，并且是走的送货单的路径，那就把送货单给她附上 - if (odsProcureOrder.getUserDefined5()!=null){ - order.setUserDefined5(mainId); - odsProcureOrderMapper.updateOdsProcureOrderByProcureCode(order); - } continue; } - order.setUserDefined5(mainId);//送货单 + order.setUserDefined11(sapPurchaseOrderQuery1.get("realDate")); order.setPlanNumber(new BigDecimal(sapPurchaseOrderQuery1.get("thisDeliNum"))); order.setUnit(sapPurchaseOrderQuery1.get("unit")); order.setSupplierCode(sapPurchaseOrderQuery1.get("lifnr")); - //order.setUserDefined9(sapPurchaseOrderQuery1.get("zmenge")); - // order.setUserDefined10(sapPurchaseOrderQuery1.get("elikz")); - // order.setUserDefined11(sapPurchaseOrderQuery1.get("eindt")); order.setCreateBy(odsProcureOrder.getCreateBy()); order.setPlanDate(new Date()); order.setOrderStatus("0"); @@ -835,7 +847,6 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { order.setCreateDate(new Date()); odsProcureOrderMapper.insertOdsProcureOrder(order); } - } return AjaxResult.success(); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java index 7db9a07a6..8c8a70e6f 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java @@ -1004,6 +1004,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsProductProductionRecords.setSiteCode(proOrderWorkorder.getFactoryCode()); wmsProductProductionRecords.setId(IdUtils.fastSimpleUUID()); wmsProductProductionRecords.setSn(proOrderWorkorder.getSn()); + wmsProductProductionRecords.setUserDefined1(proOrderWorkorder.getAttr1());//标识卡 wmsProductProductionRecords.setQuantity(proOrderWorkorder.getQuantity()); wmsProductProductionRecords.setBatchCode(proOrderWorkorder.getBatchCode()); wmsProductProductionRecords.setProductOrder(proOrderWorkorder.getWorkorderCodeSap()); diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutTrayServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutTrayServiceImpl.java index 43662f77b..6a8185c71 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutTrayServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutTrayServiceImpl.java @@ -1,6 +1,7 @@ package com.op.wms.service.impl; import java.math.BigDecimal; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -10,8 +11,10 @@ import com.alibaba.nacos.common.utils.UuidUtils; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.op.common.core.context.SecurityContextHolder; +import com.op.common.core.domain.R; import com.op.common.core.exception.ServiceException; import com.op.common.core.utils.uuid.IdUtils; +import com.op.system.api.domain.quality.QcCheckTaskWarehousingDTO; import com.op.wms.domain.*; import com.op.wms.mapper.*; import org.springframework.beans.factory.annotation.Autowired; @@ -190,30 +193,6 @@ public class WmsProductPutTrayServiceImpl implements IWmsProductPutTrayService { wmsFpStorageNewsMapper.updateWmsFpStorageNews(wmsFpStorageNews); } } -// WmsFpStorageNews wmsFpStorageNews = wmsFpStorageNewsMapper.selectWmsFpStorageNewsByProductCode(wmsProductPut.getProductCode()); -// WmsFpStorageNews wmsFpStorageNews1 = new WmsFpStorageNews(); -// // TODO 库存中没有此产品,添加 -// if (ObjectUtils.isEmpty(wmsFpStorageNews)){ -// wmsFpStorageNews1.setStorageId(IdUtils.fastSimpleUUID()); -// wmsFpStorageNews1.setWhCode(wmsProductPut.getWhCode()); -// wmsFpStorageNews1.setWaCode(wmsProductPut.getWaCode()); -// wmsFpStorageNews1.setStorageType("成品"); -// wmsFpStorageNews1.setWlCode(wmsProductPut.getWlCode()); -// wmsFpStorageNews1.setProductCode(wmsProductPut.getProductCode()); -// wmsFpStorageNews1.setProductName(wmsProductPut.getProductName()); -// BigDecimal putQuantity = new BigDecimal(wmsProductPut.getPutQuantity()); -// wmsFpStorageNews1.setAmount(putQuantity); -// wmsFpStorageNews1.setCreateBy(SecurityContextHolder.getUserName()); -// wmsFpStorageNews1.setCreateTime(new Date()); -// wmsFpStorageNewsMapper.insertWmsFpStorageNews(wmsFpStorageNews1); -// }else { -// //加库存数量 -// BigDecimal putQuantity = new BigDecimal(wmsProductPut.getPutQuantity()); -// wmsFpStorageNews.setAmount(wmsFpStorageNews.getAmount().add(putQuantity)); -// wmsFpStorageNews.setUpdateBy(SecurityContextHolder.getUserName()); -// wmsFpStorageNews.setUpdateTime(new Date()); -// wmsFpStorageNewsMapper.updateWmsFpStorageNews(wmsFpStorageNews); -// } //todo 生成库存明细 for (WmsProductPutTray wmsProductPutTray : wmsProductPutTrays) { WmsFpStorageNewsSn wmsFpStorageNewsSn1 = wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnBySnAndProductCodeAndWlCode(wmsProductPut.getProductCode(), wmsProductPutTray.getSn(), wmsProductPutTray.getWlCode()); @@ -276,6 +255,28 @@ public class WmsProductPutTrayServiceImpl implements IWmsProductPutTrayService { // wmsProductPutTrayCode.setNumber(wmsProductPutTrayCode.getNumber()+Integer.parseInt(wmsProductPutTray.getNumber())); // wmsProductPutTrayCodeMapper.updateWmsProductPutTrayCode(wmsProductPutTrayCode); } + +// for (wmsProductPut wmsReportWork: +// wmsProductPutTrays) { +// QcCheckTaskWarehousingDTO qcCheckTaskWarehousingDTO = new QcCheckTaskWarehousingDTO(); +// qcCheckTaskWarehousingDTO.setFactoryCode(factoryCode); +// qcCheckTaskWarehousingDTO.setIncomeBatchNo(wmsReportWork.getBatch()); +// qcCheckTaskWarehousingDTO.setOrderNo(wmsReportWork.getWorkorderCodeSap()); +// qcCheckTaskWarehousingDTO.setMaterialCode(wmsReportWork.getProductCode()); +// qcCheckTaskWarehousingDTO.setMaterialName(wmsReportWork.getProductName()); +// qcCheckTaskWarehousingDTO.setCheckType("checkTypeCP"); +// qcCheckTaskWarehousingDTO.setQuality(wmsReportWork.getQuantityQualified()); +// +// qcCheckTaskWarehousingDTO.setSupplierName("小榄成品现货仓"); +// qcCheckTaskWarehousingDTO.setSupplierCode(wmsReportWork.getWhCode()); +// qcCheckTaskWarehousingDTO.setCheckLoc("mjtest"); +// SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); +// Date productDate = simpleDateFormat.parse(wmsReportWork.getProductDate()); +// qcCheckTaskWarehousingDTO.setIncomeTime(productDate); +// //qcCheckTaskWarehousingDTO. +// R productTask= remoteQualityService.createProductTask(qcCheckTaskWarehousingDTO); +// productTask.getData(); +// } return 1; } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInSnMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInSnMapper.xml index 409b1a72c..4c63f5145 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInSnMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInSnMapper.xml @@ -225,4 +225,19 @@ user_defined4; + + insert into wms_logotype_table( + id, + logotype, + sn, + activeFlag + ) + values + ( + #{id}, + #{logotype}, + #{sn}, + #{activeFlag} + ) + From d2d18ee1d1a69e4c31d6557b56af9b4289de43d5 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 8 Aug 2024 23:31:29 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProOrderWorkorderServiceImpl.java | 4 +++- .../QcCheckReportIncomeController.java | 18 +++++++++--------- .../op/quality/domain/QcCheckTaskIncome.java | 9 +++++++++ .../op/quality/domain/QcCheckTaskProduce.java | 9 +++++++++ .../mapper/QcCheckReportIncomeMapper.java | 2 ++ .../impl/QcCheckReportIncomeServiceImpl.java | 4 ++++ .../impl/QcCheckReportProduceServiceImpl.java | 5 +++++ .../impl/QcCheckTaskIncomeServiceImpl.java | 2 +- .../quality/QcCheckReportIncomeMapper.xml | 9 +++++++++ .../mapper/quality/QcCheckTaskIncomeMapper.xml | 2 +- 10 files changed, 52 insertions(+), 12 deletions(-) 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 8afbe5524..41f1b24fd 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 @@ -1304,7 +1304,9 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { } } } - proOrderWorkorderMapper.addBatchPallet(dtos); + if(!CollectionUtils.isEmpty(dtos)){ + proOrderWorkorderMapper.addBatchPallet(dtos); + } }else{ dtos.addAll(dtos0); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportIncomeController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportIncomeController.java index 4ca41345e..7516fb5c3 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportIncomeController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportIncomeController.java @@ -40,15 +40,15 @@ public class QcCheckReportIncomeController extends BaseController { @GetMapping("/list") public TableDataInfo list(QcCheckReportIncome qcCheckReportIncome) { - //默认时间范围T 00:00:00~T+1 00:00:00 - if (StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())) { - qcCheckReportIncome.setCheckTimeStart(DateUtils.getDate() + " 00:00:00");//start - LocalDate date = LocalDate.now(); - LocalDate dateEnd = date.plusDays(1); - DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - String dateEndStr = dtf.format(dateEnd) + " 23:59:59"; - qcCheckReportIncome.setCheckTimeEnd(dateEndStr);//end - } +// //默认时间范围T 00:00:00~T+1 00:00:00 +// if (StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())) { +// qcCheckReportIncome.setCheckTimeStart(DateUtils.getDate() + " 00:00:00");//start +// LocalDate date = LocalDate.now(); +// LocalDate dateEnd = date.plusDays(1); +// DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); +// String dateEndStr = dtf.format(dateEnd) + " 23:59:59"; +// qcCheckReportIncome.setCheckTimeEnd(dateEndStr);//end +// } // if(StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())){ // qcCheckReportIncome.setCheckTimeStart(qcCheckReportIncome.getIncomeTimeStart());//start diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java index 4d678ccc1..f6b7da617 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java @@ -215,6 +215,15 @@ public class QcCheckTaskIncome extends BaseEntity { private String pgzr;//质量主管 private String oaFactoryF;//异常范围 private String sccj; + private String bz; + + public String getBz() { + return bz; + } + + public void setBz(String bz) { + this.bz = bz; + } public String getSccj() { return sccj; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java index acbc55e55..ba1a88d6e 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java @@ -206,6 +206,15 @@ public class QcCheckTaskProduce extends BaseEntity { private String confirmRemark; private String confirmTime; private String shiftId; + private String bz;//备注 + + public String getBz() { + return bz; + } + + public void setBz(String bz) { + this.bz = bz; + } public String getShiftId() { return shiftId; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java index 8f8612cb0..b8ac67e2c 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java @@ -85,4 +85,6 @@ public interface QcCheckReportIncomeMapper { List getLastProductTypeInfo(QcCheckTaskProduce qcCheckTaskProduce); List getBatchsByTaskId(String recordId); + + QcCheckTaskProduce getLastXJ(QcCheckTaskProduce qcCheckTaskProduce); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java index 27e558019..b52ca5b18 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java @@ -197,6 +197,10 @@ public class QcCheckReportIncomeServiceImpl implements IQcCheckReportIncomeServi public List getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail) { List dtos = qcCheckReportIncomeMapper.getCkeckProjectList(qcCheckTaskDetail); for (QcCheckTaskDetail dto : dtos) { + if(StringUtils.isNotBlank(dto.getSamplePlan())){ + dto.setSamplePlan(dto.getSamplePlan().replace(".00","")); + } + List files = qmsFileMapper.getBaseFileBatch(dto.getRecordId()); if (!CollectionUtils.isEmpty(files)) { dto.setFiles(files); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java index 6dfb5cd86..977a8a41a 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java @@ -221,6 +221,11 @@ public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceSer qcStaticTable.setShiftId(qcCheckTaskProduce.getShiftId()); List checkInfos = qcStaticTableService.getXJCheckTableDetail(qcStaticTable); produce.setCheckInfos(checkInfos); + QcCheckTaskProduce lastXJ = qcCheckReportIncomeMapper.getLastXJ(qcCheckTaskProduce); + if(lastXJ!=null){ + produce.setBz(lastXJ.getBz()); + } + List lastProduces = qcCheckReportIncomeMapper.getLastProductTypeInfo(qcCheckTaskProduce); if (!CollectionUtils.isEmpty(lastProduces)) { produce.setProductType(lastProduces.get(0).getProductType()); 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 6a7e1cbb8..6b471a58a 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 @@ -689,7 +689,7 @@ public class QcCheckTaskIncomeServiceImpl implements qcCheckTask.setCheckManName(qcCheckTaskIncome.getUpdateByName()); qcCheckTask.setSampleQuality(qcCheckTaskIncome.getSampleQuality()); qcCheckTask.setReason(qcCheckTaskIncome.getReason()); - qcCheckTask.setAttr3(qcCheckTaskIncome.getAttr3()); + qcCheckTask.setBz(qcCheckTaskIncome.getAttr3());//备注 /**qc_check_task**/ n = qcCheckTaskIncomeMapper.updateQcCheckTask(qcCheckTask); logger.info("qc_check_task:"+n); diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml index 2738f0b18..7229c15c8 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml @@ -263,6 +263,15 @@ where qct.record_id = #{recordId} order by powb.batch_code + insert into qc_check_task 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 d72e0e313..a363ca2d9 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 @@ -314,7 +314,7 @@ income_batch_no = #{incomeBatchNo}, remark = #{remark}, reason = #{reason}, - attr3 = #{attr3}, + bz = #{bz}, check_result = #{checkResult}, update_by = #{updateBy}, update_time = #{updateTime} From 74ef5ea97a854a09dacadd91eafc725348605e38 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 9 Aug 2024 11:59:15 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E6=89=8B=E7=B2=97=E8=8D=89=E7=A8=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op-common-datascope.iml | 5 +- op-common/op-common-log/op-common-log.iml | 5 +- .../op-common-security/op-common-security.iml | 5 +- .../impl/MesReportWorkConsumeServiceImpl.java | 9 +- .../QcCheckReportIncomeController.java | 18 +-- .../QcCheckReportProductController.java | 18 +-- .../op/quality/controller/QuaController.java | 14 ++ .../service/IQcCheckTaskIncomeService.java | 2 + .../impl/QcCheckTaskIncomeServiceImpl.java | 127 +++++++++++++++++- 9 files changed, 168 insertions(+), 35 deletions(-) diff --git a/op-common/op-common-datascope/op-common-datascope.iml b/op-common/op-common-datascope/op-common-datascope.iml index 3df02a46b..dab4c8afe 100644 --- a/op-common/op-common-datascope/op-common-datascope.iml +++ b/op-common/op-common-datascope/op-common-datascope.iml @@ -21,6 +21,7 @@ + @@ -30,7 +31,7 @@ - + @@ -125,4 +126,4 @@ - \ No newline at end of file + diff --git a/op-common/op-common-log/op-common-log.iml b/op-common/op-common-log/op-common-log.iml index 3df02a46b..dab4c8afe 100644 --- a/op-common/op-common-log/op-common-log.iml +++ b/op-common/op-common-log/op-common-log.iml @@ -21,6 +21,7 @@ + @@ -30,7 +31,7 @@ - + @@ -125,4 +126,4 @@ - \ No newline at end of file + diff --git a/op-common/op-common-security/op-common-security.iml b/op-common/op-common-security/op-common-security.iml index 5f28b4a04..5422c64f1 100644 --- a/op-common/op-common-security/op-common-security.iml +++ b/op-common/op-common-security/op-common-security.iml @@ -21,6 +21,7 @@ + @@ -29,7 +30,7 @@ - + @@ -124,4 +125,4 @@ - \ No newline at end of file + diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java index 8d49d1a7a..945711288 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java @@ -170,7 +170,7 @@ public class MesReportWorkConsumeServiceImpl implements IMesReportWorkConsumeSer @Override @DS("#header.poolName") - @Transactional(rollbackFor = IllegalArgumentException.class) + //@Transactional(rollbackFor = IllegalArgumentException.class) public int submitConsumePS(List mesReportWorkConsumes) { //根据belong_work_order找到sap工单(子子母) @@ -249,9 +249,10 @@ public class MesReportWorkConsumeServiceImpl implements IMesReportWorkConsumeSer logger.info(workorder.getWorkorderCode() + "报工损耗物料组件修改请求：" + JSONObject.toJSONString(mapList)); - R bomUpdateR = remoteSapService.shopOrderBomUpdate(mapList); - logger.info(workorder.getWorkorderCode() - + "报工损耗物料组件修改结果：" + JSONObject.toJSONString(bomUpdateR)); + R bomUpdateR = R.ok();// +// R bomUpdateR = remoteSapService.shopOrderBomUpdate(mapList); +// logger.info(workorder.getWorkorderCode() +// + "报工损耗物料组件修改结果：" + JSONObject.toJSONString(bomUpdateR)); if(bomUpdateR.getCode() == 200){ //attr2 0->1组件完成修改 int f = mesReportWorkMapper.updateAttr2(workorder); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportIncomeController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportIncomeController.java index 7516fb5c3..743257222 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportIncomeController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportIncomeController.java @@ -68,15 +68,15 @@ public class QcCheckReportIncomeController extends BaseController { @PostMapping("/export") public void export(HttpServletResponse response, QcCheckReportIncome qcCheckReportIncome) { - //默认时间范围T 00:00:00~T+1 00:00:00 - if (StringUtils.isEmpty(qcCheckReportIncome.getIncomeTimeStart())) { - qcCheckReportIncome.setIncomeTimeStart(DateUtils.getDate() + " 00:00:00");//start - LocalDate date = LocalDate.now(); - LocalDate dateEnd = date.plusDays(1); - DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - String dateEndStr = dtf.format(dateEnd) + " 00:00:00"; - qcCheckReportIncome.setIncomeTimeEnd(dateEndStr);//end - } +// //默认时间范围T 00:00:00~T+1 00:00:00 +// if (StringUtils.isEmpty(qcCheckReportIncome.getIncomeTimeStart())) { +// qcCheckReportIncome.setIncomeTimeStart(DateUtils.getDate() + " 00:00:00");//start +// LocalDate date = LocalDate.now(); +// LocalDate dateEnd = date.plusDays(1); +// DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); +// String dateEndStr = dtf.format(dateEnd) + " 00:00:00"; +// qcCheckReportIncome.setIncomeTimeEnd(dateEndStr);//end +// } // if(StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())){ // qcCheckReportIncome.setCheckTimeStart(qcCheckReportIncome.getIncomeTimeStart());//start diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProductController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProductController.java index d93a13a3d..0813b453d 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProductController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProductController.java @@ -71,15 +71,15 @@ public class QcCheckReportProductController extends BaseController { @PostMapping("/export") public void export(HttpServletResponse response, QcCheckReportIncome qcCheckReportIncome) { - //默认时间范围T 00:00:00~T+1 00:00:00 - if (StringUtils.isEmpty(qcCheckReportIncome.getIncomeTimeStart())) { - qcCheckReportIncome.setIncomeTimeStart(DateUtils.getDate() + " 00:00:00");//start - LocalDate date = LocalDate.now(); - LocalDate dateEnd = date.plusDays(1); - DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - String dateEndStr = dtf.format(dateEnd) + " 00:00:00"; - qcCheckReportIncome.setIncomeTimeEnd(dateEndStr);//end - } +// //默认时间范围T 00:00:00~T+1 00:00:00 +// if (StringUtils.isEmpty(qcCheckReportIncome.getIncomeTimeStart())) { +// qcCheckReportIncome.setIncomeTimeStart(DateUtils.getDate() + " 00:00:00");//start +// LocalDate date = LocalDate.now(); +// LocalDate dateEnd = date.plusDays(1); +// DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); +// String dateEndStr = dtf.format(dateEnd) + " 00:00:00"; +// qcCheckReportIncome.setIncomeTimeEnd(dateEndStr);//end +// } // if(StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())){ // qcCheckReportIncome.setCheckTimeStart(qcCheckReportIncome.getIncomeTimeStart());//start diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java index f3a49d2d7..c81f2d185 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java @@ -225,6 +225,20 @@ public class QuaController extends BaseController { } return toAjax(qcCheckTaskIncomeService.commitCheckResults(qcCheckTaskIncome)); } + @PostMapping(value = "commitCheckResultsCg") + public AjaxResult commitCheckResultsCg(@RequestBody QcCheckTaskIncome qcCheckTaskIncome) { + DynamicDataSourceContextHolder.push(qcCheckTaskIncome.getFactoryCode()); +// if(CollectionUtils.isEmpty(qcCheckTaskIncome.getQcCheckTaskDetails())){ +// return error("[List]不能为空"); +// } + if(StringUtils.isBlank(qcCheckTaskIncome.getUpdateBy())){ + return error("[updateBy]不能为空"); + } + if(StringUtils.isBlank(qcCheckTaskIncome.getUpdateByName())){ + return error("[updateByName]不能为空"); + } + return toAjax(qcCheckTaskIncomeService.commitCheckResultsCg(qcCheckTaskIncome)); + } @PostMapping(value = "getUserIdList") public List getUserIdList(@RequestBody SysUser sysUser) { 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 0f0487bf6..c121d5b5f 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 @@ -109,4 +109,6 @@ public interface IQcCheckTaskIncomeService { List getUserIdList(SysUser sysUser); SysUser getOaUserId(SysUser sysUser); + + int commitCheckResultsCg(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 6b471a58a..bc79d2441 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 @@ -642,8 +642,8 @@ public class QcCheckTaskIncomeServiceImpl implements @Override //@Transactional(rollbackFor = Exception.class) - public int commitCheckResults(QcCheckTaskIncome qcCheckTaskIncome) { - logger.info("质检提交参数："+JSONObject.toJSONString(qcCheckTaskIncome)); + public int commitCheckResultsCg(QcCheckTaskIncome qcCheckTaskIncome) { + logger.info("草稿质检提交参数："+JSONObject.toJSONString(qcCheckTaskIncome)); List details = qcCheckTaskIncome.getQcCheckTaskDetails(); Date nowTime = DateUtils.getNowDate(); @@ -668,6 +668,118 @@ public class QcCheckTaskIncomeServiceImpl implements result = qcCheckTaskIncome.getCheckResult(); } + int n = 0; + QcCheckTaskIncome qcCheckTask = new QcCheckTaskIncome(); + //qcCheckTask.setSampleQuality(sampleQua); + qcCheckTask.setUpdateBy(updateBy); + qcCheckTask.setRecordId(belongId); + qcCheckTask.setCheckStatus("2");//检测状态0待检测1检测中2检测完成 + qcCheckTask.setUpdateTime(nowTime); + qcCheckTask.setCheckTime(nowTime); + qcCheckTask.setRemark(qcCheckTaskIncome.getRemark()); + qcCheckTask.setCheckResult(result);//检验结果Y合格 N不合格 + qcCheckTask.setIncomeBatchNo(qcCheckTaskIncome.getIncomeBatchNo()); + BigDecimal noOkQquality = new BigDecimal("0"); + List defects0 = qcCheckTaskIncome.getDefects(); + for(QcCheckTaskDefect defect0:defects0){ + noOkQquality = noOkQquality.add(defect0.getNoOkQuality()); + } + qcCheckTask.setNoOkQuality(noOkQquality);//累计不合格数 + qcCheckTask.setCheckManCode(qcCheckTaskIncome.getUpdateBy()); + qcCheckTask.setCheckManName(qcCheckTaskIncome.getUpdateByName()); + qcCheckTask.setSampleQuality(qcCheckTaskIncome.getSampleQuality()); + qcCheckTask.setReason(qcCheckTaskIncome.getReason()); + qcCheckTask.setBz(qcCheckTaskIncome.getAttr3());//备注 + /**qc_check_task_cg**/ + n = qcCheckTaskIncomeMapper.updateQcCheckTask(qcCheckTask);//updateQcCheckTaskCG + logger.info("qc_check_task:"+n); + /**更新qc_check_task_detail**/ + for(QcCheckTaskDetail detail:details){ + detail.setUpdateTime(nowTime); + //上传附件 + if (StringUtils.isNotEmpty(detail.getFileListStr())) { + String[] ids = detail.getFileListStr().split(","); + List files = new ArrayList<>(); + BaseFileData file = null; + for (String id : ids) { + file = new BaseFileData(); + file.setFileId(IdUtils.fastSimpleUUID()); + file.setFileName(id.split("&fileName=")[1]); + file.setFileAddress(id); + file.setSourceId(detail.getRecordId()); + file.setCreateBy(SecurityUtils.getUsername()); + file.setCreateTime(nowTime); + files.add(file); + } + /**base_file**/ + n = qmsFileMapper.insertBaseFileBatch(files); + System.out.println("base_file:"+n); + } + + } + n= qcCheckTaskIncomeMapper.updateQcCheckTaskDetails(details); + logger.info("更新qc_check_task_detail:"+n); + + /**qc_check_task_defect**/ + n=qcCheckTaskIncomeMapper.deleteQcCheckTaskDefects(belongId); + logger.info("清理qc_check_task_defect:"+n); + List defects = new ArrayList<>(); + QcCheckTaskDefect defect = null; + for(QcCheckTaskDetail detail:details){ + if(StringUtils.isNotBlank(detail.getDefectCodes())){ + String[] defectCodes = detail.getDefectCodes().split(","); + String[] defectNames = detail.getDefectNames().split(","); + String[] defectQualitys = detail.getDefectQualitys().split(","); + for(int d=0;d details = qcCheckTaskIncome.getQcCheckTaskDetails(); + + Date nowTime = DateUtils.getNowDate(); + String factoryCode = qcCheckTaskIncome.getFactoryCode(); + String updateBy = qcCheckTaskIncome.getUpdateBy(); + String belongId = details.get(0).getBelongTo(); + String checkType = qcCheckTaskIncome.getCheckType(); + qcCheckTaskIncome.setFactoryCode(qcCheckTaskIncome.getFactoryCode().replace("ds_","")); + //默认合格 + + String result=null; + if(StringUtils.isBlank(qcCheckTaskIncome.getCheckResult())){ + result = "Y"; + for(QcCheckTaskDetail detail:details){ + if("N".equals(detail.getStatus())){ + result = "N";//不合格 + break; + } + } + }else{ + //有最终判定的情况 + result = qcCheckTaskIncome.getCheckResult(); + } + int n = 0; QcCheckTaskIncome qcCheckTask = new QcCheckTaskIncome(); //qcCheckTask.setSampleQuality(sampleQua); @@ -784,7 +896,7 @@ public class QcCheckTaskIncomeServiceImpl implements } }else if("product".equals(qcCheckTaskIncome.getTypeCode())){ - /**wms_product_put-->check_status->1**/ + /**wms_product_put-->check_status->1**/ qcCheckTaskIncome.setStatus("2"); qcCheckUnqualifiedMapper.updatePutStatus(qcCheckTaskIncome); } @@ -800,14 +912,15 @@ public class QcCheckTaskIncomeServiceImpl implements unqualified.setType(checkType); n = qcCheckUnqualifiedMapper.insertQcCheckUnqualified(unqualified); logger.info("qc_check_unqualified:" + n); - if("1".equals(qcCheckTaskIncome.getStartOA())){ - this.setOaFunc(unqualified,qcCheckTaskIncome); + if("1".equals(qcCheckTaskIncome.getStartOA())){ + this.setOaFunc(unqualified,qcCheckTaskIncome); } - //发送企业微信 - this.sendWX(qcCheckTaskIncome); + //发送企业微信 + this.sendWX(qcCheckTaskIncome); } return 1 ; } + /* 首检巡检都是品质异常流程 * 成品的是成品检验控制流程 * 来料的是来料检验不合格流程*/ From eb182893b9eb0a5443907e55c9b1cbe80acc115a Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 9 Aug 2024 12:18:25 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/mes/MesReportWorkMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml index de9e6664d..68509b2ba 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml @@ -830,7 +830,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mrwc.warehouse_code warehouseCode from mes_report_work_consume mrwc left join pro_order_workorder pow on mrwc.workorder_code = pow.workorder_code - where mrwc.attr1 = '1' and mrwc.del_flag = '0' and mrwc.attr2 = '0' + where mrwc.attr1 = '1' and mrwc.del_flag = '0' and mrwc.attr2 = '0' and pow.del_flag = '0' and mrwc.parent_order = #{workorderCode} select storage_id, wh_code, region_code, wa_code, storage_type, wl_code, material_code, material_desc, amount, storage_amount, occupy_amount, lpn, product_batch, receive_date, product_date, user_defined1, user_defined2, user_defined3, user_defined4, user_defined5, user_defined6, user_defined7, user_defined8, user_defined9, user_defined10, create_by, gmt_create, last_modified_by, gmt_modified, active_flag, factory_code, sap_factory_code, wl_name from wms_ods_mate_storage_news - where wh_code=#{whCode} and wl_code=#{wlCode} and material_code=#{materialCode} + where wh_code=#{whCode} and wl_code=#{wlCode} and wa_code=#{waCode} and material_code=#{materialCode} + SELECT + wh_code, + wl_code, + wa_code, + po_no, + material_code, + material_desc, + sn, + amount AS amount + FROM + wms_raw_order_in_sn + WHERE + user_defined3 = #{ID} + AND user_defined1 = '1' + AND active_flag = '1' + + insert into wms_logotype_table( From e214ca957e5319db21dc052316ca92058e5a20b4 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Fri, 9 Aug 2024 14:24:16 +0800 Subject: [PATCH 10/12] =?UTF-8?q?wms103=E6=9A=82=E6=94=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/wms/WmsRawOrderInSnMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInSnMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInSnMapper.xml index 1c37e0398..b63ddacc3 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInSnMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInSnMapper.xml @@ -244,7 +244,7 @@ id, logotype, sn, - activeFlag + active_flag ) values ( From 682699cb20240780360ca40a8156bd17032504bc Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Fri, 9 Aug 2024 16:44:26 +0800 Subject: [PATCH 11/12] =?UTF-8?q?wms103=E6=9A=82=E6=94=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java index 3f96c3f1e..479b7ad07 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java @@ -756,6 +756,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { paramMap.put("MATNR",order.getMaterialCode()); paramMap.put("WERKS",order.getSiteCode()); paramMap.put("QUANTITY",amount.toString()); + mapList.add(paramMap); R result2 = remoteSapService.temporarilyCollected(mapList); int code = result2.getCode(); if (code == 200){//成功 From d338843bfc0b03988ae53691a1c8af3f182a2f07 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 9 Aug 2024 17:17:15 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E8=B4=A8=E9=87=8Foa?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quality/service/impl/QcCheckUnqualifiedServiceImpl.java | 6 ++++-- .../resources/mapper/quality/QcCheckTypeProjectMapper.xml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java index 12c314bbc..f014a93ce 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java @@ -358,8 +358,10 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService mainObject.append(",\"PZYCMS\":"+"\""+detailInfo.getRemark()+"\"");//品质异常描述 mainObject.append(",\"Notes\":"+"\"\"");//测试备注 mainObject.append(",\"SFXYZG\":"+"\""+task.getSfxyzg()+"\"");//*是否需要主管审核 1否 0是 - mainObject.append(",\"PGZG\":"+"\""+task.getPgzg()+"\"");//QC主管：SFXYZG字段为"是",则此项选择QC主管信息 - mainObject.append(",\"PGZR\":"+"\""+task.getPgzr()+"\"");//质量主管 660：朱继新 + if("0".equals(task.getSfxyzg())){ + mainObject.append(",\"PGZG\":"+"\""+task.getPgzg()+"\"");//QC主管：SFXYZG字段为"是",则此项选择QC主管信息 + mainObject.append(",\"PGZR\":"+"\""+task.getPgzr()+"\"");//质量主管 660：朱继新 + } mainObject.append(",\"SFGYSWT\":"+"\""+task.getSfgyswt()+"\"");//*是否供应商问题 1非供应商问题 0是供应商问题 mainObject.append("}"); diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml index 57a272aff..e95c68323 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml @@ -319,7 +319,7 @@ from base_product bp left join qc_material_group qmg on qmg.group_code = bp.mvgr5 where bp.product_code like concat('%',#{materialCode},'%') - and bp.del_flag = '0' + and bp.del_flag = '0' and qmg.del_flag = '0' order by qmg.create_time desc