From 672b84d4a846e0a5fa3ddfaee937f2f4131a1ae2 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Mon, 18 Nov 2024 12:01:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/mes/mapper/MesReportWorkMapper.java | 2 ++ .../impl/MesReportWorkServiceImpl.java | 8 ++++- .../mapper/mes/MesReportWorkMapper.xml | 3 ++ .../impl/QcCheckTaskIncomeServiceImpl.java | 34 ++++++++++++++----- 4 files changed, 38 insertions(+), 9 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java index 35f7ed298..c74f0cf7c 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java @@ -204,4 +204,6 @@ public interface MesReportWorkMapper { @MapKey("shiftId") List> getPlanNumber(String shiftId); + + List getUnionRemark(String workorderCode); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java index fac6bee2d..1c1ff7dce 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java @@ -267,7 +267,13 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { mesReportWork.setUpdateTime(nowTime); mesReportWork.setUpdateBy(updateBy); } - + //统一备注 + List remarks = mesReportWorkMapper.getUnionRemark(mesReportWorks.get(0).getWorkorderCode()); + if(!CollectionUtils.isEmpty(remarks)){ + for(MesReportWork mesReportWork:mesReportWorks){ + mesReportWork.setRemark(remarks.get(0)); + } + } return mesReportWorkMapper.submitReportPS(mesReportWorks); } 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 0a84cd7e4..7c518b3ff 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 @@ -1083,6 +1083,9 @@ WHERE AND c.shift_id=#{shiftId} + insert into mes_report_work 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 44807806f..08c1fe8fe 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 @@ -729,7 +729,7 @@ public class QcCheckTaskIncomeServiceImpl implements BigDecimal sampleQuality = new BigDecimal("0"); for(QcCheckTaskDetail detail:details){ detail.setUpdateTime(nowTime); - sampleQuality = sampleQuality.add(new BigDecimal(detail.getSampleQuality()==null?"0":detail.getSampleQuality())); + sampleQuality = sampleQuality.add(new BigDecimal(detail.getSampleQuality().equals("")?"0":detail.getSampleQuality())); //上传附件 if (StringUtils.isNotEmpty(detail.getFileListStr())) { qmsFileMapper.clearBaseFileBatch(detail.getRecordId());//清理 @@ -1007,7 +1007,7 @@ public class QcCheckTaskIncomeServiceImpl implements BigDecimal sampleQuality = new BigDecimal("0"); for(QcCheckTaskDetail detail:details){ detail.setUpdateTime(nowTime); - sampleQuality = sampleQuality.add(new BigDecimal(detail.getSampleQuality()==null?"0":detail.getSampleQuality())); + sampleQuality = sampleQuality.add(new BigDecimal(detail.getSampleQuality().equals("")?"0":detail.getSampleQuality())); //上传附件 if (StringUtils.isNotEmpty(detail.getFileListStr())) { qmsFileMapper.clearBaseFileBatch(detail.getRecordId());//清理 @@ -1029,6 +1029,18 @@ public class QcCheckTaskIncomeServiceImpl implements System.out.println("base_file:"+n); } + /**去掉测量值0**/ + String actualValueStr = detail.getActualValue(); + if(StringUtils.isNotBlank(actualValueStr)){ + JSONArray codeArray = JSONArray.parseArray(actualValueStr); + for (int c1 = 0; c1 < codeArray.size(); c1++) { + if(codeArray.get(c1).toString().indexOf(":0")>=0&&codeArray.get(c1).toString().indexOf(".")<0) { + codeArray.remove(codeArray.get(c1)); + } + } + detail.setActualValue(codeArray.toJSONString()); + } + } if(qcCheckTaskIncome.getSampleQuality()!=null && qcCheckTaskIncome.getSampleQuality().equals(BigDecimal.ZERO)){ qcCheckTask.setSampleQuality(sampleQuality); @@ -1040,7 +1052,6 @@ public class QcCheckTaskIncomeServiceImpl implements n = qcCheckTaskIncomeMapper.updateQcCheckTask(qcCheckTask); logger.info("qc_check_task:"+n); /**更新qc_check_task_detail**/ - n= qcCheckTaskIncomeMapper.updateQcCheckTaskDetails(details); logger.info("更新qc_check_task_detail:"+n); @@ -1359,10 +1370,17 @@ public class QcCheckTaskIncomeServiceImpl implements } public static void main(String args[]){ - String str = "11,,22,"; - System.out.println(str.split(",")[0]); - System.out.println(str.split(",")[1]); - System.out.println(str.split(",")[2]); - + String actualValueStr = "[\"1:0.03\",\"2:0\",\"3:0.34\"]"; + try { + JSONArray codeArray = JSONArray.parseArray(actualValueStr); + for (int c1 = 0; c1 < codeArray.size(); c1++) { + if(codeArray.get(c1).toString().indexOf(":0")>=0&&codeArray.get(c1).toString().indexOf(".")<0) { + codeArray.remove(codeArray.get(c1)); + } + } + System.out.println(codeArray.toJSONString()); + } catch (Exception e) { + System.out.println(); + } } } From 98765a6df730d21e1965709d3a5492ff33f93215 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Mon, 18 Nov 2024 13:16:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D19?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/QcCheckTaskIncomeServiceImpl.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 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 08c1fe8fe..1d11dbd64 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 @@ -1029,17 +1029,17 @@ public class QcCheckTaskIncomeServiceImpl implements System.out.println("base_file:"+n); } - /**去掉测量值0**/ - String actualValueStr = detail.getActualValue(); - if(StringUtils.isNotBlank(actualValueStr)){ - JSONArray codeArray = JSONArray.parseArray(actualValueStr); - for (int c1 = 0; c1 < codeArray.size(); c1++) { - if(codeArray.get(c1).toString().indexOf(":0")>=0&&codeArray.get(c1).toString().indexOf(".")<0) { - codeArray.remove(codeArray.get(c1)); - } - } - detail.setActualValue(codeArray.toJSONString()); - } +// /**去掉测量值0**/ +// String actualValueStr = detail.getActualValue(); +// if(StringUtils.isNotBlank(actualValueStr)){ +// JSONArray codeArray = JSONArray.parseArray(actualValueStr); +// for (int c1 = 0; c1 < codeArray.size(); c1++) { +// if(codeArray.get(c1).toString().indexOf(":0")>=0&&codeArray.get(c1).toString().indexOf(".")<0) { +// codeArray.remove(codeArray.get(c1)); +// } +// } +// detail.setActualValue(codeArray.toJSONString()); +// } } if(qcCheckTaskIncome.getSampleQuality()!=null && qcCheckTaskIncome.getSampleQuality().equals(BigDecimal.ZERO)){ From 72d547a265ff49bec20326d6b4b94d8f4909a900 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Wed, 20 Nov 2024 15:51:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?wms=E8=A1=A5=E6=89=93=E5=92=8C=E5=86=B2?= =?UTF-8?q?=E9=94=80=E7=9A=84=E9=97=AE=E9=A2=98=E5=AE=8C=E5=96=84=E5=92=8C?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E6=AF=94=E5=A6=82=E8=BF=87=E8=B4=A6=E6=89=B9?= =?UTF-8?q?=E6=AC=A1=E7=9A=84=E5=B0=8F=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OdsProcureOutOrderController.java | 6 + .../WmsOdsMateStorageNewsController.java | 6 + .../WmsOdsMateStorageNewsSnController.java | 7 + .../WmsSellOutEmbryoController.java | 6 + .../controller/WmsToWCSmissionController.java | 17 +- .../wms/mapper/OdsProcureOutOrderMapper.java | 2 + .../mapper/WmsOdsMateStorageNewsMapper.java | 2 + .../mapper/WmsOdsMateStorageNewsSnMapper.java | 7 +- .../op/wms/mapper/WmsSellOutEmbryoMapper.java | 8 + .../service/IOdsProcureOutOrderService.java | 2 + .../IWmsOdsMateStorageNewsService.java | 2 + .../IWmsOdsMateStorageNewsSnService.java | 3 + .../op/wms/service/IWmsProductPutService.java | 2 + .../wms/service/IWmsSellOutEmbryoService.java | 1 + .../impl/OdsProcureOrderServiceImpl.java | 2 +- .../impl/OdsProcureOutOrderServiceImpl.java | 96 +++++-- .../WmsOdsMateStorageNewsServiceImpl.java | 6 + .../WmsOdsMateStorageNewsSnServiceImpl.java | 124 ++++++++- .../impl/WmsProductPutServiceImpl.java | 31 ++- .../impl/WmsRawOrderInServiceImpl.java | 1 + .../impl/WmsSellOutEmbryoServiceImpl.java | 6 +- .../mapper/wms/OdsProcureOutOrderMapper.xml | 12 + .../wms/WmsOdsMateStorageNewsMapper.xml | 13 + .../wms/WmsOdsMateStorageNewsSnMapper.xml | 11 + .../mapper/wms/WmsRawOrderInMapper.xml | 163 ++++++++---- .../mapper/wms/WmsSellOutEmbryoMapper.xml | 241 +++++++++++++++++- 26 files changed, 683 insertions(+), 94 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 544febab4..ba2fab762 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 @@ -162,4 +162,10 @@ public class OdsProcureOutOrderController extends BaseController { String result = odsProcureOutOrderService.addOdsProcureOutOrderTS(orderList); return success(result); } + //成品特殊出库 + @PostMapping("/addwmsFpStorageNewsTS") + public AjaxResult addwmsFpStorageNewsTS( @RequestBody List orderList) { + String result = odsProcureOutOrderService.addwmsFpStorageNewsTS(orderList); + return success(result); + } } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsOdsMateStorageNewsController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsOdsMateStorageNewsController.java index 76db48a43..dcff5fe1d 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsOdsMateStorageNewsController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsOdsMateStorageNewsController.java @@ -117,4 +117,10 @@ public class WmsOdsMateStorageNewsController extends BaseController { List list = wmsOdsMateStorageNewsService.listWmsOdsMateStorageNews(wmsOdsMateStorageNews); return getDataTable(list); } + @GetMapping("/listwmsFpStorageNews") + public TableDataInfo listwmsFpStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews) { + startPage(); + List list = wmsOdsMateStorageNewsService.listwmsFpStorageNews(wmsOdsMateStorageNews); + return getDataTable(list); + } } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsOdsMateStorageNewsSnController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsOdsMateStorageNewsSnController.java index c813b3aef..bad9b2b7e 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsOdsMateStorageNewsSnController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsOdsMateStorageNewsSnController.java @@ -3,6 +3,7 @@ package com.op.wms.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.op.wms.domain.OdsProcureOutOrder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -105,4 +106,10 @@ public class WmsOdsMateStorageNewsSnController extends BaseController { public AjaxResult cardDy(@RequestBody List list) { return success(wmsOdsMateStorageNewsSnService.cardDy(list)); } + //特殊出库 + @PostMapping("/cardBD") + public AjaxResult cardBD( @RequestBody List orderList) { + String result = wmsOdsMateStorageNewsSnService.cardBD(orderList); + return success(result); + } } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsSellOutEmbryoController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsSellOutEmbryoController.java index 1af6582cd..481d42acc 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsSellOutEmbryoController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsSellOutEmbryoController.java @@ -56,6 +56,12 @@ public class WmsSellOutEmbryoController extends BaseController { List list = wmsSellOutEmbryoService.selectWmsSellOutEmbryoREList(wmsSellOutEmbryo); return getDataTable(list); } + @GetMapping("/listRETS") + public TableDataInfo listRETS(WmsSellOutEmbryo wmsSellOutEmbryo) { + startPage(); + List list = wmsSellOutEmbryoService.selectWmsSellOutEmbryoREListTS(wmsSellOutEmbryo); + return getDataTable(list); + } /** * 导出成品销售出库列表 */ 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 99cc91654..8347d8797 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 @@ -453,7 +453,14 @@ public class WmsToWCSmissionController { public AjaxResult selectQueryFinishedProductSales(@RequestBody WmsSellOutEmbryo wmsSellOutEmbryo) { return AjaxResult.success(wmsProductPutService.selectQueryFinishedProductSales(wmsSellOutEmbryo)); } - + /** + * 成品销售出库--查询接口 + * + */ + @PostMapping("/selectQueryFinishedProductSalesTS") + public AjaxResult selectQueryFinishedProductSalesTS(@RequestBody WmsSellOutEmbryo wmsSellOutEmbryo) { + return AjaxResult.success(wmsProductPutService.selectQueryFinishedProductSalesTS(wmsSellOutEmbryo)); + } /** * 成品销售出库--提单查询接口 * @@ -473,6 +480,14 @@ public class WmsToWCSmissionController { public AjaxResult confirmFinishedProductSales(@RequestBody WmsSellOutEmbryo wmsSellOutEmbryo) { return AjaxResult.success(wmsProductPutService.confirmFinishedProductSales(wmsSellOutEmbryo)); } + /** + * 成品销售出库--确认接口 + * + */ + @PostMapping("/confirmFinishedProductSalesTS") + public AjaxResult confirmFinishedProductSalesTS(@RequestBody WmsSellOutEmbryo wmsSellOutEmbryo) { + return AjaxResult.success(wmsProductPutService.confirmFinishedProductSales(wmsSellOutEmbryo)); + } /** * 成品销售出库----整托扫码 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 682459563..b01a5e6e6 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 @@ -169,4 +169,6 @@ public interface OdsProcureOutOrderMapper { List selectWmsOdsProcureOutOrderSpecialByIDs(List orderList); void updateWmsRawMissionOutById(WmsOdsMateStorageNews wmsOdsMateStorageNews); + + String selectwmsFpStorageNewsTS(String formattedDate); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsMateStorageNewsMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsMateStorageNewsMapper.java index 8ddbc2ac9..36f72f1ec 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsMateStorageNewsMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsMateStorageNewsMapper.java @@ -76,4 +76,6 @@ public interface WmsOdsMateStorageNewsMapper { public List selectWmsOdsMateStorageNewsNEWSList(WmsOdsMateStorageNews wmsOdsMateStorageNews); List listWmsOdsMateStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews); + + List listwmsFpStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsMateStorageNewsSnMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsMateStorageNewsSnMapper.java index 42e15c190..44f7dc106 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsMateStorageNewsSnMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsMateStorageNewsSnMapper.java @@ -2,10 +2,7 @@ package com.op.wms.mapper; import java.util.List; -import com.op.wms.domain.WmsOdsEmStorageNews; -import com.op.wms.domain.WmsOdsMateStorageNews; -import com.op.wms.domain.WmsOdsMateStorageNewsSn; -import com.op.wms.domain.WmsToWCSDTO; +import com.op.wms.domain.*; import org.apache.ibatis.annotations.Param; /** @@ -83,4 +80,6 @@ public interface WmsOdsMateStorageNewsSnMapper { public void updateWmsOdsMateStorageNewsSnTWM(WmsOdsMateStorageNewsSn wmsRawOrderInNewsSn); List cardDy(@Param("list")List list); + + String selectWmsOdsMateStorageNewsSnBC(OdsProcureOutOrder order); } 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 b78de1f44..e5b76744d 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 @@ -87,4 +87,12 @@ public interface WmsSellOutEmbryoMapper { void updateWmsSellOutEmbryotwo(WmsSellOutEmbryo wmsSellOutEmbryoUpdate); List selectWmsSellOutEmbryoREList(WmsSellOutEmbryo wmsSellOutEmbryo); + + public int insertWmsSellOutEmbryoSpecial(WmsSellOutEmbryo wmsSellOutEmbryo1); + + + + List selectWmsSellOutEmbryoListTS(WmsSellOutEmbryo wmsSellOutEmbryo); + + List selectWmsSellOutEmbryoREListTS(WmsSellOutEmbryo wmsSellOutEmbryo); } 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 e38eca5f1..64f4b580a 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 @@ -84,4 +84,6 @@ public interface IOdsProcureOutOrderService { List listOdsProcureOutOrderTS(OdsProcureOutOrder order); String OdsProcureOutOrderTSCK(OdsProcureOutOrder order); + + String addwmsFpStorageNewsTS(List orderList); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsOdsMateStorageNewsService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsOdsMateStorageNewsService.java index 921468e30..9a7ac5788 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsOdsMateStorageNewsService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsOdsMateStorageNewsService.java @@ -64,4 +64,6 @@ public interface IWmsOdsMateStorageNewsService { List selectWmsOdsMateStorageNewslsList(WmsOdsMateStorageNews wmsOdsMateStorageNews); List listWmsOdsMateStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews); + + List listwmsFpStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsOdsMateStorageNewsSnService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsOdsMateStorageNewsSnService.java index 5a9145047..5cb6b10f2 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsOdsMateStorageNewsSnService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsOdsMateStorageNewsSnService.java @@ -2,6 +2,7 @@ package com.op.wms.service; import java.util.List; +import com.op.wms.domain.OdsProcureOutOrder; import com.op.wms.domain.WmsOdsMateStorageNewsSn; /** @@ -60,4 +61,6 @@ public interface IWmsOdsMateStorageNewsSnService { public int deleteWmsOdsMateStorageNewsSnByMateOrderInSnId(Long mateOrderInSnId); String cardDy(List list); + + String cardBD(List orderList); } 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 766d1a9b7..841d6fccd 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 @@ -144,4 +144,6 @@ public interface IWmsProductPutService { ProOrderWorkorder finishedProductProductionRecordscar(ProOrderWorkorder proOrderWorkorder); String WmsProductPutByWorkOrderConfirmT(WmsProductPut wmsProductPutList); + + List selectQueryFinishedProductSalesTS(WmsSellOutEmbryo wmsSellOutEmbryo); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsSellOutEmbryoService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsSellOutEmbryoService.java index 00a2e8abf..f28ac09be 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsSellOutEmbryoService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsSellOutEmbryoService.java @@ -85,4 +85,5 @@ public interface IWmsSellOutEmbryoService { String addRE(List wmsSellOutEmbryoList); + List selectWmsSellOutEmbryoREListTS(WmsSellOutEmbryo wmsSellOutEmbryo); } 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 9dd4d579a..902aa747d 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 @@ -910,7 +910,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { qcCheckTaskIncomeDTO.setMaterialCode(order1.getMaterialCode()); qcCheckTaskIncomeDTO.setMaterialName(order1.getMaterialDesc()); // qcCheckTaskIncomeDTO.setIncomeBatchNo(order.getUserDefined2()); - qcCheckTaskIncomeDTO.setOrderNo(order1.getProcureCode()); + qcCheckTaskIncomeDTO.setOrderNo(order1.getProcureCode()+order1.getUserDefined7()); qcCheckTaskIncomeDTO.setIncomeTime(new Date()); R ruslt= remoteQualityService.createIncomeTask(qcCheckTaskIncomeDTO); // 成功后修改-- 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 6dee8918b..bb31e3f49 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 @@ -11,14 +11,12 @@ import com.op.common.core.utils.uuid.IdUtils; import com.op.common.security.utils.SecurityUtils; import com.op.system.api.domain.sap.SapBackflushMPQuery; import com.op.system.api.domain.sap.SapMaterialPosting; -import com.op.wms.domain.WmsOdsEmStorageNews; -import com.op.wms.domain.WmsOdsMateStorageNews; -import com.op.wms.domain.WmsOdsMateStorageNewsSn; +import com.op.wms.domain.*; import com.op.wms.mapper.WmsOdsMateStorageNewsSnMapper; +import com.op.wms.mapper.WmsSellOutEmbryoMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.wms.mapper.OdsProcureOutOrderMapper; -import com.op.wms.domain.OdsProcureOutOrder; import com.op.wms.service.IOdsProcureOutOrderService; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -38,6 +36,8 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService @Autowired private WmsOdsMateStorageNewsSnMapper wmsOdsMateStorageNewsSnMapper; + @Autowired + private WmsSellOutEmbryoMapper wmsSellOutEmbryoMapper; /** * 查询包材出库单 * @@ -259,6 +259,7 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService @Override @DS("#header.poolName") public String addOdsProcureOutOrderTS(List orderList) { + String results="操作完成"; HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String key = "#header.poolName"; String factoryCode = request.getHeader(key.substring(8)).replace("ds_", ""); @@ -270,8 +271,9 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService for (OdsProcureOutOrder order: orderList) { order.setID(IdUtils.fastSimpleUUID()); - order.setFactoryCode(factoryCode); +// order.setFactoryCode(factoryCode); order.setActive("1"); + order.setSiteCode(factoryCode); order.setProduceCode("TS"+result); order.setCreateDate(new Date()); order.setUserDefined1(result);//批次 @@ -281,7 +283,7 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService odsProcureOutOrderMapper.addOdsProcureOutOrderTS(order); } - return null; + return results; } @@ -392,20 +394,76 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService } return result; } + + @Override + @DS("#header.poolName") + public String addwmsFpStorageNewsTS(List orderList) { + String results="操作完成"; + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + String factoryCode = request.getHeader(key.substring(8)).replace("ds_", ""); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); + //TH ods_procure_order_card + Date date = new Date(); + String formattedDate = dateFormat.format(date); + + String result= odsProcureOutOrderMapper.selectwmsFpStorageNewsTS(formattedDate); + for (OdsProcureOutOrder order: + orderList) { +// order.setID(IdUtils.fastSimpleUUID()); +// order.setFactoryCode(factoryCode); +// order.setActive("1"); +// order.setProduceCode("TS"+result); +// order.setCreateDate(new Date()); +// order.setUserDefined1(result);//批次 +// order.setOutNumber(new BigDecimal("0")); +// order.setCreateBy(order.getCreateBy()); +// order.setOrderStatus("0");//0,未出库。1部分出库，2全部出库 + // odsProcureOutOrderMapper.addOdsProcureOutOrderTS(order); + WmsSellOutEmbryo wmsSellOutEmbryo1=new WmsSellOutEmbryo(); + wmsSellOutEmbryo1.setId(IdUtils.fastSimpleUUID()); + wmsSellOutEmbryo1.setDeliveryOrder("TS"+result);//交货单号 + // wmsSellOutEmbryo1.setAttr1(VBELN_VA);//attr1 + wmsSellOutEmbryo1.setLotNumber(result); + wmsSellOutEmbryo1.setProductCode(order.getMaterialCode()); + wmsSellOutEmbryo1.setProductName(order.getMaterialDesc()); + wmsSellOutEmbryo1.setFactoryCode(factoryCode); + wmsSellOutEmbryo1.setOutQuantity(new BigDecimal("0")); + wmsSellOutEmbryo1.setAttr10(order.getUserDefined4()); + wmsSellOutEmbryo1.setAttr1(order.getUserDefined6());//订单类型 + wmsSellOutEmbryo1.setAttr3(order.getUserDefined3());//成本中心 + wmsSellOutEmbryo1.setAttr2(order.getUserDefined2());// // 总账科目编号 + wmsSellOutEmbryo1.setAttr5(order.getUserDefined5());//// 货架寿命到期日 + wmsSellOutEmbryo1.setOutDate(order.getPlanDate()); + wmsSellOutEmbryo1.setWhCode(order.getLocCode()); + wmsSellOutEmbryo1.setPlanQuantity(order.getPlanNumber()); + wmsSellOutEmbryo1.setUnitOfMeasure(order.getUserDefined1()); + wmsSellOutEmbryo1.setStatus("0");//0,未出库。1部分出库，2全部出库 + wmsSellOutEmbryo1.setSapStatus("0"); + wmsSellOutEmbryo1.setActiveFlag("1"); + wmsSellOutEmbryo1.setCreateBy(order.getCreateBy()); + wmsSellOutEmbryo1.setCreateTime(new Date()); + wmsSellOutEmbryoMapper.insertWmsSellOutEmbryoSpecial(wmsSellOutEmbryo1); + } + + return results; + } + public void OutboundPostingzcSAPGYTS(List orderList) { -// //先根据出库单获取 -//// * 退料的移动类型为 262 -//// * 领料的移动类型为 261-- and wms_ods_procure_out_order.Order_Status='3' -// //我把过账状态-- and wms_ods_procure_out_order.User_Defined10!='2'去掉了 -// List orderList1 = odsProcureOutOrderMapper.selectWmsOdsProcureOutOrderSpecialByIDs(orderList); -// if (orderList1.size()>0){ -// return; -// } -// if ("成本中心".equals(orderList1.get(0).getUserDefined6())){ -// -// }else {//内部订单 -// -// } + //先根据出库单获取 +// * 退料的移动类型为 262 +// * 领料的移动类型为 261-- and wms_ods_procure_out_order.Order_Status='3' + //我把过账状态-- and wms_ods_procure_out_order.User_Defined10!='2'去掉了 + List orderList1 = odsProcureOutOrderMapper.selectWmsOdsProcureOutOrderSpecialByIDs(orderList); + if (orderList1.size()>0){ + return; + } + + if ("成本中心".equals(orderList1.get(0).getUserDefined6())){//区分出来内部订单 + + }else {//内部订单 + + } // List orderList2 = new ArrayList<>();//非反冲 // List> mapList = new ArrayList<>();//非反冲 // List sapMaterialPostingFCList = new ArrayList<>();//反冲 diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsOdsMateStorageNewsServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsOdsMateStorageNewsServiceImpl.java index 012d59e90..c7170a781 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsOdsMateStorageNewsServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsOdsMateStorageNewsServiceImpl.java @@ -218,6 +218,12 @@ public class WmsOdsMateStorageNewsServiceImpl implements IWmsOdsMateStorageNewsS return wmsOdsMateStorageNewsMapper.listWmsOdsMateStorageNews(wmsOdsMateStorageNews); } + @Override + @DS("#header.poolName") + public List listwmsFpStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews) { + return wmsOdsMateStorageNewsMapper.listwmsFpStorageNews(wmsOdsMateStorageNews); + } + public String dayin( List orderList) { // 定义请求的URL地址 String url = dayinUrl1; diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsOdsMateStorageNewsSnServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsOdsMateStorageNewsSnServiceImpl.java index c6470e1e7..a77f6311c 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsOdsMateStorageNewsSnServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsOdsMateStorageNewsSnServiceImpl.java @@ -1,15 +1,20 @@ package com.op.wms.service.impl; import java.io.IOException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.util.*; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONArray; import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.utils.uuid.IdUtils; +import com.op.common.security.utils.SecurityUtils; import com.op.wms.domain.OdsProcureOrder; +import com.op.wms.domain.OdsProcureOutOrder; +import com.op.wms.domain.WmsOdsMateStorageNews; import com.op.wms.mapper.OdsProcureOrderMapper; +import com.op.wms.mapper.WmsOdsMateStorageNewsMapper; import okhttp3.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -17,6 +22,10 @@ import org.springframework.stereotype.Service; import com.op.wms.mapper.WmsOdsMateStorageNewsSnMapper; import com.op.wms.domain.WmsOdsMateStorageNewsSn; import com.op.wms.service.IWmsOdsMateStorageNewsSnService; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; /** * 包材库存明细表Service业务层处理 @@ -34,6 +43,8 @@ public class WmsOdsMateStorageNewsSnServiceImpl implements IWmsOdsMateStorageNew private WmsOdsMateStorageNewsSnMapper wmsOdsMateStorageNewsSnMapper; @Autowired private OdsProcureOrderMapper odsProcureOrderMapper; + @Autowired + private WmsOdsMateStorageNewsMapper wmsOdsMateStorageNewsMapper; /** * 查询包材库存明细表 * @@ -128,6 +139,113 @@ public class WmsOdsMateStorageNewsSnServiceImpl implements IWmsOdsMateStorageNew return result; } + /** + * Unit + * : + * "ST" + * locCode + * : + * "WH02" + * materialCode + * : + * "40000015051" + * materialDesc + * : + * "榄菊加大盘野菊花蚊香塑料筒装(18装)(36单圈)纸箱(2201)" + * planNumber + * : + * "200" + * @param orderList + * @return + */ + @Override + @DS("#header.poolName") + public String cardBD(List orderList) {// + //获取当前所选工厂 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + String msg="补打成功"; + String factoryCode = request.getHeader(key.substring(8)).replace("ds_", ""); + for (OdsProcureOutOrder order: + orderList) { + //入参是物料，仓库，库区，数量，生成标识卡， + String BC= wmsOdsMateStorageNewsSnMapper.selectWmsOdsMateStorageNewsSnBC(order); + List dtos0=new ArrayList<>(); + String setid=IdUtils.fastSimpleUUID();// + OdsProcureOrder odsProcureOrder= new OdsProcureOrder(); + odsProcureOrder.setFactoryCode(factoryCode); + odsProcureOrder.setSiteCode(factoryCode); + odsProcureOrder.setProcureCode(order.getMaterialCode());// + //pw.setUserDefined3(order.getUserDefined3());//行项目 + odsProcureOrder.setMaterialCode(order.getMaterialCode()); + odsProcureOrder.setMaterialDesc(order.getMaterialDesc()); + odsProcureOrder.setPlanNumber(order.getPlanNumber()); + odsProcureOrder.setSupplierCode(order.getUserDefined2()); + odsProcureOrder.setSupplierName(order.getUserDefined3()); + odsProcureOrder.setUserDefined8("2"); + odsProcureOrder.setUserDefined7(BC);//批次--我直接取已经有的批次 + odsProcureOrder.setUserDefined10("0");//标识卡状态0是未收货的 + odsProcureOrder.setUserDefined11(order.getUserDefined4()); + // odsProcureOrder.setUserDefined4();//id + odsProcureOrder.setUnit(order.getUnit()); + odsProcureOrder.setCardNum("1"); + odsProcureOrder.setPlanNumber(order.getPlanNumber()); + // String dateString = pw.getUserDefined11().replace("-", ""); + String materialCode = order.getMaterialCode().replaceFirst("^0{7}", ""); // 只替换开头的7个0 + odsProcureOrder.setUserDefined1(materialCode+"-"+setid+"-"+"1"); + odsProcureOrder.setCreateTime(new Date()); + odsProcureOrder.setActive("1"); + dtos0.add(odsProcureOrder); + odsProcureOrderMapper.addBatchPallet(dtos0); + + WmsOdsMateStorageNews wmsOdsMateStorageNews3 = new WmsOdsMateStorageNews(); + wmsOdsMateStorageNews3.setStorageId(IdUtils.fastSimpleUUID()); + wmsOdsMateStorageNews3.setWhCode(order.getLocCode()); + wmsOdsMateStorageNews3.setWlCode(odsProcureOrder.getUserDefined1()); + wmsOdsMateStorageNews3.setWaCode(order.getWaCode()); + wmsOdsMateStorageNews3.setAmount(order.getPlanNumber()); +// wmsOdsMateStorageNews3.setStorageAmount(odsProcureOutOrder.getPlanNumber()); + wmsOdsMateStorageNews3.setMaterialCode(order.getMaterialCode()); + wmsOdsMateStorageNews3.setMaterialDesc(order.getMaterialDesc()); + wmsOdsMateStorageNews3.setStorageType("BC"); + wmsOdsMateStorageNews3.setCreateBy(SecurityUtils.getUsername()); + wmsOdsMateStorageNews3.setGmtCreate(new Date()); + wmsOdsMateStorageNews3.setActiveFlag("1"); + wmsOdsMateStorageNews3.setFactoryCode(factoryCode); + wmsOdsMateStorageNews3.setSapFactoryCode(factoryCode); + wmsOdsMateStorageNews3.setUserDefined1(order.getUnit());//单位 + wmsOdsMateStorageNewsMapper.insertWmsOdsMateStorageNews(wmsOdsMateStorageNews3); + WmsOdsMateStorageNewsSn wmsOdsMateStorageNewsSn = new WmsOdsMateStorageNewsSn(); + wmsOdsMateStorageNewsSn.setMateOrderInSnId(IdUtils.fastSimpleUUID()); + wmsOdsMateStorageNewsSn.setWhCode(order.getLocCode());//仓库编码 + // wmsOdsMateStorageNewsSn.setWaCode(pw.getUserDefined1()); + wmsOdsMateStorageNewsSn.setWlCode(odsProcureOrder.getUserDefined1());//库位编码 + wmsOdsMateStorageNewsSn.setSn(odsProcureOrder.getUserDefined1()); + wmsOdsMateStorageNewsSn.setMaterialCode(order.getMaterialCode()); + wmsOdsMateStorageNewsSn.setMaterialDesc(order.getMaterialDesc()); + // wmsOdsMateStorageNewsSn.setSn(order.getUserDefined1()); + wmsOdsMateStorageNewsSn.setAmount(order.getPlanNumber()); + wmsOdsMateStorageNewsSn.setWaCode(order.getWaCode()); + wmsOdsMateStorageNewsSn.setCreateBy(SecurityUtils.getUsername()); + wmsOdsMateStorageNewsSn.setGmtCreate(new Date()); + wmsOdsMateStorageNewsSn.setUserDefined2(BC);//批次 + wmsOdsMateStorageNewsSn.setUserDefined1("RK"); + wmsOdsMateStorageNewsSn.setUserDefined3("1");//0是暂收，1是真收 + wmsOdsMateStorageNewsSn.setFactoryCode(factoryCode); + wmsOdsMateStorageNewsSn.setSapFactoryCode(factoryCode); + wmsOdsMateStorageNewsSn.setActiveFlag("1"); + wmsOdsMateStorageNewsSnMapper.insertWmsOdsMateStorageNewsSn(wmsOdsMateStorageNewsSn); + for (OdsProcureOrder order1: + dtos0 ) { + String materialCode1= order1.getMaterialCode();//000000040000004873 + materialCode1 = materialCode1.replaceFirst("^0{7}", ""); // 只替换开头的7个0 + order1.setMaterialCode(materialCode1); + } + msg= dayin(dtos0); + } + return msg; + } + public String dayin( List orderList) { // 定义请求的URL地址 String url = dayinUrl1; 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 8da7b0dbe..5d9e0582e 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 @@ -297,15 +297,15 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { map.put("ERFME", wmsProductPut3.getUnitOfMeasure()); map.put("BATCH", wmsProductPut3.getAttr4()); map.put("STCK_TYPE", wmsProductPut1.getAttr3()); - //map.put("BATCH", wmsProductPut3.getBatchNumber()); -// if (wmsProductPut3.getBatchNumber().length()>12){ -// //String batch = mesReportWork.getBatch().substring(12); -// String batch = InterceptionRules(wmsProductPut3.getBatchNumber()); -// map.put("BATCH", batch); -// }else { -// map.put("BATCH", wmsProductPut3.getBatchNumber()); -// } - map.put("HSDAT", wmsProductPut3.getProductDate()); + + if (wmsProductPut3.getBatchNumber().length()==24){ + + String HSDAT = InterceptionSJRules(wmsProductPut3.getBatchNumber()); + map.put("HSDAT", HSDAT); + }else { + map.put("HSDAT", wmsProductPut3.getProductDate()); + } + mapList.add(map); } R result = remoteSapService.sapOrderReceipt(mapList); @@ -516,7 +516,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { map.put("ERFME", mesReportWork.getUnit()); map.put("BATCH", mesReportWork.getBatchSK()); map.put("STCK_TYPE", selectedType); - if (mesReportWork.getBatch().length()>12&&mesReportWork.getBatch().length()<30){ + if (mesReportWork.getBatch().length()==24){ //String batch = mesReportWork.getBatch().substring(12); String HSDAT = InterceptionSJRules(mesReportWork.getBatch()); map.put("HSDAT", HSDAT); @@ -559,7 +559,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { map.put("ERFME", mesReportWork.getUnit()); map.put("BATCH", mesReportWork.getBatchSK()); map.put("STCK_TYPE", selectedType); - if (mesReportWork.getBatch().length()>12&&mesReportWork.getBatch().length()<30){ + if (mesReportWork.getBatch().length()==24){ //String batch = mesReportWork.getBatch().substring(12); String HSDAT = InterceptionSJRules(mesReportWork.getBatch()); map.put("HSDAT", HSDAT); @@ -1250,6 +1250,15 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { return SUCCESS; } + @Override + public List selectQueryFinishedProductSalesTS(WmsSellOutEmbryo wmsSellOutEmbryo) { + //wms_sell_out_embryo + DynamicDataSourceContextHolder.push("ds_" + wmsSellOutEmbryo.getFactoryCode()); + wmsSellOutEmbryo.setActiveFlag("1"); + List wmsSellOutEmbryoList= wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoListTS(wmsSellOutEmbryo); + return wmsSellOutEmbryoList; + } + @Override public List FinishedProductSalesReturn(WmsRuturnPutEmbryo wmsRuturnPutEmbryo) { DynamicDataSourceContextHolder.push("ds_" + wmsRuturnPutEmbryo.getFactoryCode()); diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsRawOrderInServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsRawOrderInServiceImpl.java index 71b633f03..3ca331f7c 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsRawOrderInServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsRawOrderInServiceImpl.java @@ -44,6 +44,7 @@ public class WmsRawOrderInServiceImpl implements IWmsRawOrderInService { List wmsRawOrderInList= wmsRawOrderInMapper.selectWmsRawOrderInList(wmsRawOrderIn); for (WmsRawOrderIn wmsRawOrderIn1: wmsRawOrderInList) { + wmsRawOrderIn1.setUserDefined6( wmsRawOrderIn1.getPoNo()+wmsRawOrderIn1.getUserDefined7()); String checkResult = wmsRawOrderInMapper.selectQcCheckTask(wmsRawOrderIn1); wmsRawOrderIn1.setQualityStatus(checkResult); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsSellOutEmbryoServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsSellOutEmbryoServiceImpl.java index d519cb6b8..b2f3c360d 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsSellOutEmbryoServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsSellOutEmbryoServiceImpl.java @@ -193,7 +193,11 @@ public class WmsSellOutEmbryoServiceImpl implements IWmsSellOutEmbryoService { return null; } - + @Override + @DS("#header.poolName") + public List selectWmsSellOutEmbryoREListTS(WmsSellOutEmbryo wmsSellOutEmbryo) { + return wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoREListTS(wmsSellOutEmbryo); + } public List dayin( ) { 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 85957c413..f26144521 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 @@ -1515,6 +1515,7 @@ and User_Defined1 like concat('%', #{userDefined1}, '%') and User_Defined2 = #{userDefined2} and User_Defined3 like concat('%', #{userDefined3}, '%') + and User_Defined4 like concat('%', #{userDefined4}, '%') and sn = #{sn} and create_by = #{createBy} and gmt_create = #{createDate} @@ -1761,6 +1762,17 @@ WHERE User_Defined1 LIKE CONCAT('%', #{formattedDate}, '%'); + + + diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsSnMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsSnMapper.xml index 9f7ea8fd9..8df57e299 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsSnMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsSnMapper.xml @@ -392,4 +392,15 @@ + diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInMapper.xml index 2de78326f..4ed1fcf04 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInMapper.xml @@ -66,68 +66,125 @@ 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 472676c68..7efdad889 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 @@ -127,6 +127,84 @@ ORDER BY create_time DESC + + SELECT + id, + delivery_order, + Item_number, + active_flag, + factory_code, + wh_code, + wa_code, + wl_code, + delivery_place, + product_name, + product_code, + product_sort, + specification, + unit_of_measure, + lot_number, + plan_quantity, + out_quantity, + status, + SAP_status, + SAP_proof, + SAP_message, + out_date, + attr1, + attr2, + attr3, + attr4, + attr5, + attr6, + attr7, + attr8, + attr9, + attr10, + create_by, + create_time, + update_by, + update_time, + remark + FROM + wms_sell_out_embryo_special + + and delivery_order = #{deliveryOrder} + and Item_number = #{itemNumber} + and factory_code = #{factoryCode} + and wh_code = #{whCode} + and wa_code = #{waCode} + and wl_code = #{wlCode} + and delivery_place = #{deliveryPlace} + and product_name like concat('%', #{productName}, + '%') + + and product_code = #{productCode} + and product_sort = #{productSort} + and specification = #{specification} + and unit_of_measure = #{unitOfMeasure} + and lot_number = #{lotNumber} + and plan_quantity = #{planQuantity} + and out_quantity = #{outQuantity} + and status = #{status} + and SAP_status = #{sapStatus} + and SAP_proof = #{sapProof} + and SAP_message = #{sapMessage} + and out_date = #{outDate} + and active_flag = #{activeFlag} + and attr1 = #{attr1} + and attr2 = #{attr2} + and attr3 = #{attr3} + and attr4 = #{attr4} + and attr5 = #{attr5} + and attr6 = #{attr6} + and attr7 = #{attr7} + and attr8 = #{attr8} + and attr9 = #{attr9} + and attr10 = #{attr10} + + ORDER BY create_time DESC + +