From 080e34f4ff7ec6c725659a3e0165d42d3cbf892a Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Mon, 1 Apr 2024 13:53:13 +0800 Subject: [PATCH 1/4] =?UTF-8?q?wms=E6=88=90=E5=93=81=E8=B0=83=E6=8B=A8?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B928?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WmsToWCSmissionController.java | 8 ++ .../op/wms/mapper/WmsSellOutEmbryoMapper.java | 4 + .../op/wms/service/IWmsProductPutService.java | 2 + .../impl/WmsProductPutServiceImpl.java | 57 +++++++++++- .../mapper/wms/WmsRuturnPutEmbryoMapper.xml | 16 ++-- .../mapper/wms/WmsSellOutEmbryoMapper.xml | 89 ++++++++++++++++++- 6 files changed, 166 insertions(+), 10 deletions(-) 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 fff8eab10..6d018c525 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 @@ -339,6 +339,14 @@ public class WmsToWCSmissionController { } + /** + * 成品调拨出库--确认接口 + * + */ + @PostMapping("/confirmFinishedProductTransferAndOutbound") + public AjaxResult confirmFinishedProductTransferAndOutbound(@RequestBody WmsAllocationOutEmbryo wmsRuturnPutEmbryo) { + return AjaxResult.success(wmsProductPutService.confirmFinishedProductTransferAndOutbound(wmsRuturnPutEmbryo)); + } /** diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsSellOutEmbryoMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsSellOutEmbryoMapper.java index c5d6c78b1..e65557d93 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsSellOutEmbryoMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsSellOutEmbryoMapper.java @@ -79,4 +79,8 @@ public interface WmsSellOutEmbryoMapper { public WmsSellOutEmbryo selectWmsSellOutEmbryoByOrderCodeAndProductCode(@Param("deliveryOrder") String deliveryOrder, @Param("productCode") String productCode); List selectWmsAllocationOutEmbryoList(WmsAllocationOutEmbryo wmsAllocationOutEmbryo); + + WmsAllocationOutEmbryo selectWmsAllocationOutEmbryoById(String id); + + void updateWmsAllocationOutEmbryo(WmsAllocationOutEmbryo wmsAllocationOutEmbryo); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java index dea2995d6..d9161afc1 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java @@ -120,4 +120,6 @@ public interface IWmsProductPutService { List selectFinishedProductTransferAndOutbound(WmsAllocationOutEmbryo wmsRuturnPutEmbryo); + + String confirmFinishedProductTransferAndOutbound(WmsAllocationOutEmbryo wmsRuturnPutEmbryo); } 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 102b4112a..a217521e8 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 @@ -830,7 +830,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsProductPutRecords.setProductName(wmsRuturnPutEmbryo.getProductName()); wmsProductPutRecords.setProductCode(wmsRuturnPutEmbryo.getProductCode()); wmsProductPutRecords.setWhCode(wmsRuturnPutEmbryo.getWhCode());//仓库编码 - + wmsProductPutRecords.setFactoryCode(wmsRuturnPutEmbryo.getFactoryCode()); wmsProductPutRecords.setWlCode(wmsProductPut1.getWlCode());//库位编码 wmsProductPutRecords.setAttr1(wmsProductPut1.getSn());////托盘号编码 wmsProductPutRecords.setAttr2(wmsProductPut1.getNumber());//箱数 @@ -890,4 +890,59 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { List wmsAllocationOutEmbryoList= wmsSellOutEmbryoMapper.selectWmsAllocationOutEmbryoList(wmsAllocationOutEmbryo); return wmsAllocationOutEmbryoList; } + + @Override + public String confirmFinishedProductTransferAndOutbound(WmsAllocationOutEmbryo wmsRuturnPutEmbryo) { + String result1="出库成功"; + DynamicDataSourceContextHolder.push("ds_" + wmsRuturnPutEmbryo.getFactoryCode()); + List wmsProductPutTrayCodeList= wmsRuturnPutEmbryo.getWmsProductPutTrayCodeList(); + //成品销售出库--确认接口---修改出库单，--出库库存 + WmsAllocationOutEmbryo wmsSellOutEmbryo1 = wmsSellOutEmbryoMapper.selectWmsAllocationOutEmbryoById(wmsRuturnPutEmbryo.getId()); + Integer tem= wmsProductPutTrayCodeList.size(); + BigDecimal OutQuantity= wmsSellOutEmbryo1.getOutQuantity().add(new BigDecimal(tem));//2 + int result = wmsSellOutEmbryo1.getPlanQuantity().compareTo(OutQuantity); + WmsAllocationOutEmbryo wmsAllocationOutEmbryo=new WmsAllocationOutEmbryo(); + if (result == 0){//出库完 + wmsAllocationOutEmbryo.setStatus("1"); + }else { + wmsAllocationOutEmbryo.setStatus("0"); + } + wmsAllocationOutEmbryo.setId(wmsRuturnPutEmbryo.getId()); + wmsAllocationOutEmbryo.setOutQuantity(OutQuantity); + wmsSellOutEmbryoMapper.updateWmsAllocationOutEmbryo(wmsAllocationOutEmbryo); + //订单修改完成 + for(WmsProductPutTrayCode wmsProductPutTrayCode: wmsProductPutTrayCodeList){ + //库存修改 + //解除绑定 + wmsProductPutTrayCode.setRelatStatus("0"); + wmsProductPutTrayCodeMapper.updateWmsProductPutTrayCode(wmsProductPutTrayCode); + //改明细 + WmsFpStorageNewsSn wmsFpStorageNewsSn=new WmsFpStorageNewsSn(); + wmsFpStorageNewsSn.setSn(wmsProductPutTrayCode.getSn()); + wmsFpStorageNewsSn.setWlCode(wmsProductPutTrayCode.getWlCode()); + wmsFpStorageNewsSn.setActiveFlag("1"); + wmsFpStorageNewsSn.setProductCode(wmsSellOutEmbryo1.getProductCode()); + wmsFpStorageNewsSnMapper.updateWmsFpStorageNewsSnOut(wmsFpStorageNewsSn); + //判断如果托盘数据被出完，就关闭这个明细 + List wmsFpStorageNewsSns= wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnList(wmsFpStorageNewsSn); + if (wmsFpStorageNewsSns.size()>0){ + WmsFpStorageNewsSn wmsFpStorageNewsSn1= wmsFpStorageNewsSns.get(0); + + BigDecimal ken= new BigDecimal(wmsFpStorageNewsSn1.getUserDefined2()); + int comparisonResult = ken.compareTo(wmsFpStorageNewsSn1.getAmount()); + if (comparisonResult == 0) { + // ken和amount相等 + wmsFpStorageNewsSn1.setActiveFlag("0"); + wmsFpStorageNewsSnMapper.updateWmsFpStorageNewsSn(wmsFpStorageNewsSn1); + } + } + //改主表 + WmsFpStorageNews wmsFpStorageNews=new WmsFpStorageNews(); + wmsFpStorageNews.setActiveFlag("1"); + wmsFpStorageNews.setWlCode(wmsProductPutTrayCode.getWlCode()); + wmsFpStorageNews.setProductCode(wmsSellOutEmbryo1.getProductCode()); + wmsFpStorageNewsMapper.updateWmsFpStorageNewsOut(wmsFpStorageNews); + } + return result1; + } } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRuturnPutEmbryoMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRuturnPutEmbryoMapper.xml index 563a3eb6d..93c536f85 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRuturnPutEmbryoMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRuturnPutEmbryoMapper.xml @@ -160,14 +160,14 @@ product_name, product_code, product_sort, - specification, + specification, unit_of_measure, plan_quantity, put_quantity, status, - SAP_status, - SAP_proof, - SAP_message, + SAP_status, + SAP_proof, + SAP_message, put_date, attr1, attr2, @@ -195,14 +195,14 @@ #{productName}, #{productCode}, #{productSort}, - #{specification}, + #{speciFication}, #{unitOfMeasure}, #{planQuantity}, #{putQuantity}, #{status}, - #{SAPStatus}, - #{SAPProof}, - #{SAPMessage}, + #{sapStatus}, + #{sapProof}, + #{sapMessage}, #{putDate}, #{attr1}, #{attr2}, diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsSellOutEmbryoMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsSellOutEmbryoMapper.xml index bbf16715c..a63ba04c7 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsSellOutEmbryoMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsSellOutEmbryoMapper.xml @@ -281,7 +281,7 @@ #{id} - SELECT id, delivery_order, @@ -358,4 +358,91 @@ and attr10 = #{attr10} + + + update wms_allocation_out_embryo + + delivery_order = #{deliveryOrder}, + Item_number = #{itemNumber}, + factory_code = #{factoryCode}, + wh_code = #{whCode}, + wa_code = #{waCode}, + wl_code = #{wlCode}, + delivery_place = #{deliveryPlace}, + product_name = #{productName}, + product_code = #{productCode}, + product_sort = #{productSort}, + specification = #{specification}, + unit_of_measure = #{unitOfMeasure}, + lot_number = #{lotNumber}, + plan_quantity = #{planQuantity}, + out_quantity = #{outQuantity}, + status = #{status}, + SAP_status = #{sapStatus}, + SAP_proof = #{sapProof}, + SAP_message = #{sapMessage}, + out_date = #{outDate}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + attr5 = #{attr5}, + attr6 = #{attr6}, + attr7 = #{attr7}, + attr8 = #{attr8}, + attr9 = #{attr9}, + attr10 = #{attr10}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + From b3bcf1594fba5dd2d1535fe49288543cc8644ad6 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Mon, 1 Apr 2024 13:55:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A4=9C=E7=8F=AD=E5=B7=A1=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/mes/controller/MesBoardController.java | 6 ++-- .../java/com/op/mes/mapper/MesMapper.java | 2 +- .../quality/domain/QcCheckReportIncome.java | 9 +++++ .../op/quality/domain/QcCheckTaskProduce.java | 9 +++++ .../com/op/quality/domain/QcStaticTable.java | 10 +++++- .../quality/mapper/QcStaticTableMapper.java | 2 ++ .../impl/QcCheckReportProduceServiceImpl.java | 1 + .../impl/QcStaticTableServiceImpl.java | 8 ++++- .../quality/QcCheckTaskProduceMapper.xml | 6 ++-- .../mapper/quality/QcStaticTableMapper.xml | 28 +++++++++++++++ .../com/op/sap/controller/SapController.java | 35 ++++++++++++++++++- .../op/sap/service/impl/SapItemSyncImpl.java | 6 ++++ 12 files changed, 113 insertions(+), 9 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesBoardController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesBoardController.java index 5b792d074..8c1f9f8c8 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesBoardController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesBoardController.java @@ -36,7 +36,7 @@ public class MesBoardController extends BaseController { /**计划产量、当前产量、15天的产量趋势图**/ @PostMapping("/getProduction15Days") - public AjaxResult getProduction15Days(BoardDTO mesBoard) { + public AjaxResult getProduction15Days(@RequestBody BoardDTO mesBoard) { if (StringUtils.isBlank(mesBoard.getFactoryCode())) { return error("[facotryCode] 不能为空"); } @@ -48,9 +48,9 @@ public class MesBoardController extends BaseController { /**产线信息**/ @PostMapping("/getProductionLineInfo") - public AjaxResult getProductionLineInfo(BoardDTO mesBoard) { + public AjaxResult getProductionLineInfo(@RequestBody BoardDTO mesBoard) { if (StringUtils.isBlank(mesBoard.getFactoryCode())) { - return error("[facotryCode] 不能为空"); + return error("[factoryCode] 不能为空"); } if (StringUtils.isBlank(mesBoard.getEquCode())) { return error("[equCode] 不能为空"); diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java index 82fed22b0..063a71a68 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java @@ -77,7 +77,7 @@ public interface MesMapper { List getLineList(BoardDTO boardDTO); - @MapKey("dayStr") + @MapKey("productDate") Map getProduction15Days(BoardDTO boardDTO); BoardDTO getWorkOrder(BoardDTO boardDTO); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java index 5afc755e4..130ecf4f4 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java @@ -185,6 +185,15 @@ public class QcCheckReportIncome extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date confirmTime; private Boolean myself; + private String shiftId; + + public String getShiftId() { + return shiftId; + } + + public void setShiftId(String shiftId) { + this.shiftId = shiftId; + } public Boolean getMyself() { return myself; 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 df8df2f14..acbc55e55 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 @@ -205,6 +205,15 @@ public class QcCheckTaskProduce extends BaseEntity { private String confirm; private String confirmRemark; private String confirmTime; + private String shiftId; + + public String getShiftId() { + return shiftId; + } + + public void setShiftId(String shiftId) { + this.shiftId = shiftId; + } public String getConfirm() { return confirm; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java index a3e864209..9a69cc942 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java @@ -41,7 +41,7 @@ public class QcStaticTable extends BaseEntity { private String typeCode; private String checkResult; private String noOkBatchRate; - + private String shiftId; private String ymArrayStart; private String ymArrayEnd; private List legendData; @@ -106,6 +106,14 @@ public class QcStaticTable extends BaseEntity { private List details; private String[] projectNoArray; + public String getShiftId() { + return shiftId; + } + + public void setShiftId(String shiftId) { + this.shiftId = shiftId; + } + public String[] getProjectNoArray() { return projectNoArray; } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java index b2732f2e7..36b641509 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java @@ -51,6 +51,8 @@ public interface QcStaticTableMapper { @MapKey("ymdms") Map getProjectDetail(QcStaticTable qcStaticTable); + @MapKey("ymdms") + Map getProjectDetailNight(QcStaticTable qcStaticTable); List getBatchnos(String orderNo); 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 7bceff9d0..0b70e8246 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 @@ -218,6 +218,7 @@ public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceSer QcStaticTable qcStaticTable = new QcStaticTable(); qcStaticTable.setOrderNo(qcCheckTaskProduce.getOrderNo()); + qcStaticTable.setShiftId(qcCheckTaskProduce.getShiftId()); List checkInfos = qcStaticTableService.getXJCheckTableDetail(qcStaticTable); produce.setCheckInfos(checkInfos); QcCheckTaskProduce lastProduce = qcCheckReportIncomeMapper.getLastProductTypeInfo(qcCheckTaskProduce); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java index 0b74694ef..ae7e83ed7 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java @@ -171,7 +171,13 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { @DS("#header.poolName") public List getXJCheckTableDetail(QcStaticTable qcStaticTable) { List projects = qcStaticTableMapper.getXJProjects(qcStaticTable); - Map detailMap = qcStaticTableMapper.getProjectDetail(qcStaticTable); + Map detailMap = null; + if(qcStaticTable.getShiftId().equals("5")){ + detailMap = qcStaticTableMapper.getProjectDetail(qcStaticTable); + }else if(qcStaticTable.getShiftId().equals("2")){ + detailMap = qcStaticTableMapper.getProjectDetailNight(qcStaticTable); + } + Map picsMap = qcStaticTableMapper.picsMap(qcStaticTable); for (QcStaticTable project : projects) { this.getDataFromMap(detailMap, project, picsMap); diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml index a24887afe..899582654 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml @@ -82,7 +82,8 @@ - + + @@ -339,7 +340,7 @@ + +