From 35bd9fa6cc6196e3a14bd90918ffce9069191b6c Mon Sep 17 00:00:00 2001 From: "maxw@mesnac.com" Date: Mon, 2 Dec 2024 14:04:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=EF=BC=8C=E5=9B=9B=EF=BC=8C=E4=BA=94?= =?UTF-8?q?=E6=A5=BC=E4=BB=93=E5=82=A8=E5=92=8C=E7=94=9F=E4=BA=A7=E7=9A=84?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FifthMesBorderController.java | 22 + .../controller/ThirdMesBorderController.java | 9 + .../board/service/FifthMesBorderService.java | 8 + .../board/service/SecondMesBorderService.java | 2 +- .../board/service/ThirdMesBorderService.java | 2 + .../impl/FifthMesBoardServiceImpl.java | 20 + .../impl/SecondMesBoardServiceImpl.java | 2 +- .../impl/ThirdMesBorderServiceImpl.java | 5 + .../hw/mes/mapper/MesProductOrderMapper.java | 9 +- .../mes/mapper/MesProductionQualifiedDao.java | 3 + .../mapper/mes/MesProductOrderMapper.xml | 40 +- .../mes/MesProductionQualifiedMapper.xml | 3 + .../controller/FirstWmsBorderController.java | 51 ++ .../controller/FourthWmsBorderController.java | 52 ++ .../board/service/FirstWmsBorderService.java | 24 + .../board/service/FourthWmsBorderService.java | 23 + .../board/service/SecondWmsBorderService.java | 2 +- .../impl/FirstWmsBoardServiceImpl.java | 74 +++ .../impl/FouthWmsBoardServiceImpl.java | 77 +++ .../impl/SecondWmsBoardServiceImpl.java | 18 +- .../impl/ThirdWmsBorderServiceImpl.java | 4 + .../com/hw/wms/domain/MesProductOrder.java | 609 ++++++++++++++++++ .../com/hw/wms/domain/WmsProductInstock.java | 8 + .../hw/wms/mapper/WmsBaseLocationMapper.java | 16 + .../wms/mapper/WmsProductInstockMapper.java | 4 + .../wms/mapper/WmsProductOutstockMapper.java | 5 + .../hw/wms/mapper/WmsProductStockMapper.java | 2 + .../hw/wms/mapper/WmsRawInstockMapper.java | 15 + .../hw/wms/mapper/WmsRawOutstockMapper.java | 14 + .../mapper/wms/WmsBaseLocationMapper.xml | 27 +- .../mapper/wms/WmsProductInstockMapper.xml | 20 + .../mapper/wms/WmsProductOutstockMapper.xml | 18 + .../mapper/wms/WmsProductStockMapper.xml | 11 +- .../mapper/wms/WmsRawInstockMapper.xml | 51 +- .../mapper/wms/WmsRawOutstockMapper.xml | 53 +- 35 files changed, 1289 insertions(+), 14 deletions(-) create mode 100644 hw-modules/hw-wms/src/main/java/com/hw/wms/board/controller/FirstWmsBorderController.java create mode 100644 hw-modules/hw-wms/src/main/java/com/hw/wms/board/controller/FourthWmsBorderController.java create mode 100644 hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/FirstWmsBorderService.java create mode 100644 hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/FourthWmsBorderService.java create mode 100644 hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/FirstWmsBoardServiceImpl.java create mode 100644 hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/FouthWmsBoardServiceImpl.java create mode 100644 hw-modules/hw-wms/src/main/java/com/hw/wms/domain/MesProductOrder.java diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/board/controller/FifthMesBorderController.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/board/controller/FifthMesBorderController.java index e7a0555e..f6ea6b49 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/board/controller/FifthMesBorderController.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/board/controller/FifthMesBorderController.java @@ -28,5 +28,27 @@ public class FifthMesBorderController { public AjaxResult workOrderProgress(){ return AjaxResult.success(fifthMesBorderService.workOrderProgress()); } + /** + * 生产合格 + */ + @GetMapping("/productionQualified") + public AjaxResult productionQualified(){ + return AjaxResult.success(fifthMesBorderService.productionQualified()); + } + + /** + * 工单生产时长 + */ + @GetMapping("/orderTime") + public AjaxResult orderTime(){ + return AjaxResult.success(fifthMesBorderService.orderTime()); + } + /** + * 工位生产效率 + */ + @GetMapping("/orderEfficiency") + public AjaxResult orderEfficiency(){ + return AjaxResult.success(fifthMesBorderService.orderEfficiency()); + } } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/board/controller/ThirdMesBorderController.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/board/controller/ThirdMesBorderController.java index c31a9982..ae49d137 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/board/controller/ThirdMesBorderController.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/board/controller/ThirdMesBorderController.java @@ -59,4 +59,13 @@ public class ThirdMesBorderController { return AjaxResult.success(thirdMesBorderService.rawInstock()); } + /** + * 获取三楼风机状态 + * @return + */ + @GetMapping("/getLineStatus") + public AjaxResult getLineStatus(){ + return AjaxResult.success(thirdMesBorderService.getLineStatus()); + } + } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/FifthMesBorderService.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/FifthMesBorderService.java index 5aaa1a3a..b60acb53 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/FifthMesBorderService.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/FifthMesBorderService.java @@ -1,7 +1,9 @@ package com.hw.mes.board.service; +import com.hw.mes.domain.MesProduceStatisticsDetail; import com.hw.mes.domain.MesProductOrder; +import com.hw.mes.domain.MesProductionQualified; import java.util.List; import java.util.Map; @@ -11,4 +13,10 @@ public interface FifthMesBorderService { MesProductOrder productProgress(); List workOrderProgress(); + + List productionQualified(); + + List orderTime(); + + List orderEfficiency(); } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/SecondMesBorderService.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/SecondMesBorderService.java index 0de0c282..a847b373 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/SecondMesBorderService.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/SecondMesBorderService.java @@ -16,7 +16,7 @@ public interface SecondMesBorderService { MesProductOrder selectLatestWorkOrder(); - Boolean getLineStatus(); + String getLineStatus(); List> getHourProduction(); diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/ThirdMesBorderService.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/ThirdMesBorderService.java index 9daabc63..cefd4ab7 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/ThirdMesBorderService.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/ThirdMesBorderService.java @@ -19,4 +19,6 @@ public interface ThirdMesBorderService{ List productCompleteCount(); List rawInstock(); + + String getLineStatus(); } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/impl/FifthMesBoardServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/impl/FifthMesBoardServiceImpl.java index b5da7a7f..432315ff 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/impl/FifthMesBoardServiceImpl.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/impl/FifthMesBoardServiceImpl.java @@ -2,8 +2,11 @@ package com.hw.mes.board.service.impl; import com.hw.mes.board.service.FifthMesBorderService; +import com.hw.mes.domain.MesProduceStatisticsDetail; import com.hw.mes.domain.MesProductOrder; +import com.hw.mes.domain.MesProductionQualified; import com.hw.mes.mapper.MesProductOrderMapper; +import com.hw.mes.mapper.MesProductionQualifiedDao; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -14,6 +17,8 @@ import java.util.List; public class FifthMesBoardServiceImpl implements FifthMesBorderService { @Autowired private MesProductOrderMapper mesProductOrderMapper; + @Autowired + private MesProductionQualifiedDao mesProductionQualifiedDao; @Override public MesProductOrder productProgress() { @@ -24,4 +29,19 @@ public class FifthMesBoardServiceImpl implements FifthMesBorderService { public List workOrderProgress() { return mesProductOrderMapper.selectFifthWorkorder(); } + + @Override + public List productionQualified() { + return mesProductionQualifiedDao.productionQualified(); + } + + @Override + public List orderEfficiency() { + return mesProductOrderMapper.orderEfficiency(); + } + + @Override + public List orderTime() { + return mesProductOrderMapper.orderTime(); + } } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/impl/SecondMesBoardServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/impl/SecondMesBoardServiceImpl.java index 4689e3a4..fdbc667f 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/impl/SecondMesBoardServiceImpl.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/impl/SecondMesBoardServiceImpl.java @@ -29,7 +29,7 @@ public class SecondMesBoardServiceImpl implements SecondMesBorderService { } @Override - public Boolean getLineStatus() { + public String getLineStatus() { return mesProductOrderMapper.getLineStatus(); } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/impl/ThirdMesBorderServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/impl/ThirdMesBorderServiceImpl.java index 5dbea4df..964c2698 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/impl/ThirdMesBorderServiceImpl.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/board/service/impl/ThirdMesBorderServiceImpl.java @@ -46,6 +46,11 @@ public class ThirdMesBorderServiceImpl implements ThirdMesBorderService { } + @Override + public String getLineStatus() { + return mesProductOrderMapper.getLineThirdStatus(); + } + @Override public List rawInstock() { List list = mesProductOrderMapper.rawInstock(); diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesProductOrderMapper.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesProductOrderMapper.java index 3c1cb85a..d3a93b21 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesProductOrderMapper.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesProductOrderMapper.java @@ -8,6 +8,7 @@ import java.util.Map; import com.hw.mes.board.domain.DmsRealtimeStatusHistory; import com.hw.mes.board.domain.RawAmount; import com.hw.mes.board.domain.RecordIotenvInstant; +import com.hw.mes.domain.MesProduceStatisticsDetail; import com.hw.mes.domain.MesProductOrder; import org.apache.ibatis.annotations.Mapper; @@ -20,6 +21,8 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface MesProductOrderMapper { + List orderEfficiency(); + /** * 查询生产工单 * @@ -97,7 +100,7 @@ public interface MesProductOrderMapper MesProductOrder selectLatestWorkOrder(); - Boolean getLineStatus(); + String getLineStatus(); List> getHourProduction(); @@ -122,4 +125,8 @@ public interface MesProductOrderMapper List> productAmount(); List thirdOrderPlan(); + + List orderTime(); + + String getLineThirdStatus(); } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesProductionQualifiedDao.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesProductionQualifiedDao.java index 07e15ee0..9ff341e9 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesProductionQualifiedDao.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesProductionQualifiedDao.java @@ -1,6 +1,7 @@ package com.hw.mes.mapper; import com.hw.mes.domain.MesProductionQualified; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.data.domain.Pageable; @@ -12,7 +13,9 @@ import java.util.List; * @author makejava * @since 2024-11-25 11:14:21 */ +@Mapper public interface MesProductionQualifiedDao { + List productionQualified(); /** * 通过ID查询单条数据 diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductOrderMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductOrderMapper.xml index 17bdc59a..7644ead7 100644 --- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductOrderMapper.xml +++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductOrderMapper.xml @@ -395,7 +395,7 @@ FROM mes_product_order WHERE plan_begin_time = (select max(plan_begin_time) FROM mes_product_order) order by product_order_id desc limit 1 - SELECT x.status_value FROM `hwjy-cloud`.dms_realtime_status x where x.status_name = '烘干机风机状态' SELECT x.* FROM `hwjy-cloud`.mes_product_order x where x.plan_begin_time > now() - interval 1 month order by plan_begin_time asc + + + diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductionQualifiedMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductionQualifiedMapper.xml index 54eefa8c..84e23dc5 100644 --- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductionQualifiedMapper.xml +++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductionQualifiedMapper.xml @@ -67,6 +67,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" parameterType="java.lang.Long"> select * from mes_production_qualified where qualified_id = #{qualifiedId} + insert into mes_alarm_info diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/board/controller/FirstWmsBorderController.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/controller/FirstWmsBorderController.java new file mode 100644 index 00000000..ea26dae4 --- /dev/null +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/controller/FirstWmsBorderController.java @@ -0,0 +1,51 @@ +package com.hw.wms.board.controller; + +import com.hw.common.core.web.domain.AjaxResult; +import com.hw.wms.board.service.FirstWmsBorderService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("FirstWmsBorder") +public class FirstWmsBorderController { + @Autowired + private FirstWmsBorderService firstWmsBorderService; + /** + * 当日出、入库详情 + */ + @GetMapping("/inAndOutInfo") + public AjaxResult inAndOutInfo(){ + return AjaxResult.success(firstWmsBorderService.inAndOutInfo()); + } + /** + * 原材料库存占比 + */ + @GetMapping("stockPercentage") + public AjaxResult stockPercentage(){ + return AjaxResult.success(firstWmsBorderService.stockPercentage()); + } + /** + * 采购订单 + */ + @GetMapping("purchaseInfo") + public AjaxResult purchaseInfo(){ + return AjaxResult.success(firstWmsBorderService.purchaseInfo()); + } + /** + * 生产订单物料需求 + */ + @GetMapping("/bomInfo") + public AjaxResult bomInfo(){ + return AjaxResult.success(firstWmsBorderService.bomInfo()); + } + /** + * 成品出入库 + */ + @GetMapping("/productInAndOutInfo") + public AjaxResult productInAndOutInfo(){ + return AjaxResult.success(firstWmsBorderService.productInAndOutInfo()); + } + +} diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/board/controller/FourthWmsBorderController.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/controller/FourthWmsBorderController.java new file mode 100644 index 00000000..acf8e299 --- /dev/null +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/controller/FourthWmsBorderController.java @@ -0,0 +1,52 @@ +package com.hw.wms.board.controller; + +import com.hw.common.core.web.domain.AjaxResult; +import com.hw.wms.board.service.FirstWmsBorderService; +import com.hw.wms.board.service.FourthWmsBorderService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("FourthWmsBorder") +public class FourthWmsBorderController { + @Autowired + private FourthWmsBorderService fouthWmsBorderService; + /** + * 当日原材料出、入库详情 + */ + @GetMapping("/inAndOutInfo") + public AjaxResult inAndOutInfo(){ + return AjaxResult.success(fouthWmsBorderService.inAndOutInfo()); + } + /** + * 原材料库存占比 + */ + @GetMapping("stockPercentage") + public AjaxResult stockPercentage(){ + return AjaxResult.success(fouthWmsBorderService.stockPercentage()); + } + /** + * 成品出入库 + */ + @GetMapping("/productInAndOutInfo") + public AjaxResult productInAndOutInfo(){ + return AjaxResult.success(fouthWmsBorderService.productInAndOutInfo()); + } + /** + * 采购订单 + */ + @GetMapping("purchaseInfo") + public AjaxResult purchaseInfo(){ + return AjaxResult.success(fouthWmsBorderService.purchaseInfo()); + } + /** + * 生产订单物料需求 + */ + @GetMapping("/bomInfo") + public AjaxResult bomInfo(){ + return AjaxResult.success(fouthWmsBorderService.bomInfo()); + } + +} diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/FirstWmsBorderService.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/FirstWmsBorderService.java new file mode 100644 index 00000000..06fb03ef --- /dev/null +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/FirstWmsBorderService.java @@ -0,0 +1,24 @@ +package com.hw.wms.board.service; + + +import com.hw.wms.domain.MesProductOrder; +import com.hw.wms.domain.WmsBaseLocation; +import com.hw.wms.domain.WmsProductInstock; +import com.hw.wms.domain.WmsRawInstock; + +import java.util.List; +import java.util.Map; + +public interface FirstWmsBorderService { + + + Map inAndOutInfo(); + + Map stockPercentage(); + + List purchaseInfo(); + + List bomInfo(); + + List productInAndOutInfo(); +} diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/FourthWmsBorderService.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/FourthWmsBorderService.java new file mode 100644 index 00000000..488c0c9f --- /dev/null +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/FourthWmsBorderService.java @@ -0,0 +1,23 @@ +package com.hw.wms.board.service; + + +import com.hw.wms.domain.MesProductOrder; +import com.hw.wms.domain.WmsProductInstock; +import com.hw.wms.domain.WmsRawInstock; + +import java.util.List; +import java.util.Map; + +public interface FourthWmsBorderService { + + + Map inAndOutInfo(); + + Map stockPercentage(); + + List productInAndOutInfo(); + + List purchaseInfo(); + + List bomInfo(); +} diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/SecondWmsBorderService.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/SecondWmsBorderService.java index 36f8e47c..7cfc676e 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/SecondWmsBorderService.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/SecondWmsBorderService.java @@ -22,5 +22,5 @@ public interface SecondWmsBorderService { Map instockTimeCount(); - BigDecimal todayInstockAmount(); + Map todayInstockAmount(); } diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/FirstWmsBoardServiceImpl.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/FirstWmsBoardServiceImpl.java new file mode 100644 index 00000000..f0646f01 --- /dev/null +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/FirstWmsBoardServiceImpl.java @@ -0,0 +1,74 @@ +package com.hw.wms.board.service.impl; + +import com.hw.wms.board.service.FifthWmsBorderService; +import com.hw.wms.board.service.FirstWmsBorderService; +import com.hw.wms.domain.*; +import com.hw.wms.mapper.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Service +public class FirstWmsBoardServiceImpl implements FirstWmsBorderService { + @Autowired + private WmsRawOutstockMapper wmsRawOutstockMapper; + @Autowired + private WmsRawInstockMapper wmsRawInstockMapper; + @Autowired + private WmsBaseLocationMapper wmsBaseLocationMapper; + @Autowired + private WmsProductInstockMapper wmsProductInstockMapper; + @Override + public Map inAndOutInfo() { + List rawOutstocks = wmsRawOutstockMapper.selectInAndOutInfo(); + List inStocks = wmsRawInstockMapper.selectInAndOutInfo(); + HashMap> map = new HashMap<>(); + map.put("rawOutstocks",rawOutstocks); + map.put("inStocks",inStocks); + return map; + } + + @Override + public Map stockPercentage() { + int stockAmount = wmsBaseLocationMapper.stockAmount(); + int nostockAmount = wmsBaseLocationMapper.nostockAmount(); + int productstockAmount = wmsBaseLocationMapper.productstockAmount(); + int noProductstockAmount = wmsBaseLocationMapper.noProductstockAmount(); + HashMap map = new HashMap<>(); + map.put("stockAmount",stockAmount); + map.put("nostockAmount",nostockAmount); + map.put("productstockAmount",productstockAmount); + map.put("noProductstockAmount",noProductstockAmount); + return map; + + } + + @Override + public List productInAndOutInfo() { + List instocks = wmsProductInstockMapper.productFirstInInfo(); + List outstocks = wmsRawOutstockMapper.productFirstOutInfo(); + for (WmsProductInstock instock : instocks) { + for (WmsProductInstock outstock : outstocks) { + if (instock.getDay().equals(outstock.getDay())){ + instock.setOutStockAmount(outstock.getInstockAmount()); + } + } + } + return instocks; + } + + @Override + public List bomInfo() { + return wmsRawInstockMapper.bomInfo(1); + + } + + @Override + public List purchaseInfo() { + return wmsRawInstockMapper.purchaseInfo(); + } +} diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/FouthWmsBoardServiceImpl.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/FouthWmsBoardServiceImpl.java new file mode 100644 index 00000000..ecacc8f0 --- /dev/null +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/FouthWmsBoardServiceImpl.java @@ -0,0 +1,77 @@ +package com.hw.wms.board.service.impl; + +import com.hw.wms.board.service.FirstWmsBorderService; +import com.hw.wms.board.service.FourthWmsBorderService; +import com.hw.wms.domain.MesProductOrder; +import com.hw.wms.domain.WmsProductInstock; +import com.hw.wms.domain.WmsRawInstock; +import com.hw.wms.domain.WmsRawOutstock; +import com.hw.wms.mapper.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Service +public class FouthWmsBoardServiceImpl implements FourthWmsBorderService { + @Autowired + private WmsRawOutstockMapper wmsRawOutstockMapper; + @Autowired + private WmsRawInstockMapper wmsRawInstockMapper; + @Autowired + private WmsBaseLocationMapper wmsBaseLocationMapper; + @Autowired + private WmsProductInstockMapper wmsProductInstockMapper; + @Autowired + private WmsProductOutstockMapper wmsProductOutstockMapper; + + @Override + public Map inAndOutInfo() { + List rawOutstock = wmsRawOutstockMapper.fourthOutstockList(); + List inStocks = wmsRawInstockMapper.fourthInstockList(); + HashMap> map = new HashMap<>(); + map.put("rawOutstock",rawOutstock); + map.put("inStocks",inStocks); + return map; + } + + @Override + public Map stockPercentage() { + Integer stockAmount = wmsBaseLocationMapper.selectFourthLocation(); + Integer nostockAmount = wmsBaseLocationMapper.selectFourthNostockLocation(); + Integer fustockLocation = wmsBaseLocationMapper.selectFourthFustockLocation(); + Integer noFustockLocation = wmsBaseLocationMapper.selectFourthNoFustockLocation(); + HashMap map = new HashMap<>(); + map.put("stockAmount",stockAmount); + map.put("nostockAmount",nostockAmount); + map.put("fustockLocation",fustockLocation); + map.put("noFustockLocation",noFustockLocation); + return map; + } + + @Override + public List bomInfo() { + return wmsRawInstockMapper.bomInfo(3); + } + + @Override + public List purchaseInfo() { + return wmsRawInstockMapper.purchaseFirstInfo(); + } + + @Override + public List productInAndOutInfo() { + List instocks = wmsProductInstockMapper.productInInfo(); + List outstocks = wmsRawOutstockMapper.productOutInfo(); + for (WmsProductInstock instock : instocks) { + for (WmsProductInstock outstock : outstocks) { + if (instock.getDay().equals(outstock.getDay())){ + instock.setOutStockAmount(outstock.getInstockAmount()); + } + } + } + return instocks; + } +} diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/SecondWmsBoardServiceImpl.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/SecondWmsBoardServiceImpl.java index e240b804..5c935810 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/SecondWmsBoardServiceImpl.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/SecondWmsBoardServiceImpl.java @@ -5,6 +5,8 @@ import com.hw.wms.domain.WmsProductInstock; import com.hw.wms.domain.WmsProductOutstock; import com.hw.wms.domain.WmsProductOutstockDetail; import com.hw.wms.domain.WmsProductStock; +import com.hw.wms.mapper.WmsProductInstockMapper; +import com.hw.wms.mapper.WmsProductOutstockMapper; import com.hw.wms.mapper.WmsProductStockMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -20,6 +22,8 @@ import java.util.stream.Collectors; public class SecondWmsBoardServiceImpl implements SecondWmsBorderService { @Autowired private WmsProductStockMapper wmsProductStockMapper; + @Autowired + private WmsProductOutstockMapper wmsProductOutstockMapper; @Override public List totalStock() { @@ -27,9 +31,17 @@ public class SecondWmsBoardServiceImpl implements SecondWmsBorderService { } @Override - public BigDecimal todayInstockAmount() { - BigDecimal result = wmsProductStockMapper.todayInstockAmount(); - return result; + public Map todayInstockAmount() { + BigDecimal dayInstockAmount = wmsProductStockMapper.todayInstockAmount(); + BigDecimal dayOutstockAmount = wmsProductOutstockMapper.todayOutstockAmount(); + BigDecimal monthInstockAmount = wmsProductStockMapper.monthInstockAmount(); + BigDecimal monthOutstockAmount = wmsProductOutstockMapper.monthOutstockAmount(); + HashMap map = new HashMap<>(); + map.put("dayInstockAmount",dayInstockAmount); + map.put("dayOutstockAmount",dayOutstockAmount); + map.put("monthInstockAmount",monthInstockAmount); + map.put("monthOutstockAmount",monthOutstockAmount); + return map; } @Override diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/ThirdWmsBorderServiceImpl.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/ThirdWmsBorderServiceImpl.java index 91e3e30b..8fa1999a 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/ThirdWmsBorderServiceImpl.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/board/service/impl/ThirdWmsBorderServiceImpl.java @@ -27,9 +27,13 @@ public class ThirdWmsBorderServiceImpl implements ThirdWmsBorderService { public Map monthRawAmount() { BigDecimal monthRawInAmount = wmsRawInstockMapper.monthRawInAmount(); BigDecimal monthRawOutAmount = wmsRawOutstockMapper.monthRawOutAmount(); + BigDecimal dayRawInAmount = wmsRawInstockMapper.dayRawInAmount(); + BigDecimal dayRawOutAmount = wmsRawOutstockMapper.dayRawOutAmount(); HashMap hashMap = new HashMap(); hashMap.put("monthRawInAmount",monthRawInAmount); hashMap.put("monthRawOutAmount",monthRawOutAmount); + hashMap.put("dayRawInAmount",dayRawInAmount); + hashMap.put("dayRawOutAmount",dayRawOutAmount); return hashMap; } diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/MesProductOrder.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/MesProductOrder.java new file mode 100644 index 00000000..8b51101b --- /dev/null +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/MesProductOrder.java @@ -0,0 +1,609 @@ +package com.hw.wms.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.hw.common.core.annotation.Excel; +import com.hw.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * 生产工单对象 mes_product_order + * + * @author Yinq + * @date 2024-02-20 + */ +public class MesProductOrder extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + private Long productOrderId; + + /** + * 工单编号 + */ + @Excel(name = "工单编号") + private String orderCode; + + /** + * 销售订单ID,关联mes_sale_order的order_id;一个销售订单可以有多个生产工单 + */ + @Excel(name = "销售订单ID") + private Long saleOrderId; + + /** + * 销售订单编号 + */ + @Excel(name = "销售订单编号") + private String saleorderCode; + + /** + * 销售订单行号 + */ + @Excel(name = "销售订单行号") + private String saleorderLinenumber; + + /** + * 项目编号 + */ + @Excel(name = "项目编号") + private String projectNo; + + /** + * 销售类型 + */ + @Excel(name = "销售类型（1外部销售 2对内生产 3集装箱生产)") + private String saleType; + + /** + * 物料ID,关联mes_base_material_info的material_id;成品信息 + */ + @Excel(name = "物料ID") + private Long materialId; + + /** + * 物料bomID，关联mes_material_bom的material_bom_id;默认选择最新的正常状态的bom，可修改 + */ + @Excel(name = "物料bomID") + private Long materialBomId; + + /**对内生产生产的实际物料信息*/ + private Long produceMaterialId; + + /** + * BOM说明 + */ + @Excel(name = "BOM说明") + private String materialBomDesc; + + /** + * 派工类型(1产线 2工艺路线) + */ + @Excel(name = "派工类型") + private String dispatchType; + + /** + * 派工ID（派工类型为产线关联产线主键，派工类型为工艺路线关联工艺路线主键） + */ + @Excel(name = "派工ID") + private Long dispatchId; + + + /** + * 柜体渠道 + */ + private String cabinetChannel; + + + /** + * 销售数量;销售订单的销售数量 + */ + @Excel(name = "销售数量") + private BigDecimal saleAmount; + + /** + * 计划数量 + */ + @Excel(name = "计划数量") + private BigDecimal planAmount; + + /** + * 已派工数量;派工类型是工艺路线的每个工位派工数量相同，派工类型是产线的派工数量是所有工位累加的 + */ + @Excel(name = "已派工数量") + private BigDecimal dispatchAmount; + + /** + * 完成数量 + */ + @Excel(name = "完成数量") + private BigDecimal completeAmount; + + /** + * 发布时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "发布时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date releaseTime; + + /** + * 计划开始时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "计划开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date planBeginTime; + + /** + * 计划结束时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "计划结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date planEndTime; + + /** + * 开始时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date realBeginTime; + + /** + * 完成时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date realEndTime; + + /** + * 计划交货日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "计划交货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date planDeliveryDate; + + /** + * 工单状态：0-待发布；1-已发布；2-已完成；3-已开始；4-暂停；8-已撤回；9-已删除 + */ + @Excel(name = "工单状态") + private String orderStatus; + + /** + * 库存锁定标识：1-是；0-否 + */ + @Excel(name = "库存锁定标识") + private String stockLockFlag; + + /** + * 是否销售订单创建生产工单（1=是;0=否） + */ + private String saleOrderFlag; + + /** + * 工艺路线名称 + */ + @Excel(name = "工艺路线名称") + private String dispatchName; + + /** + * 成品编号 + */ + @Excel(name = "成品编号") + private String materialCode; + + /** + * 成品名称 + */ + @Excel(name = "成品名称") + private String materialName; + + /** + * 成品规格 + */ + private String materialSpec; + + /** + * 生产物料编号 + */ + private String produceMaterialCode; + + /** + * 生产物料名称 + */ + private String produceMaterialName; + + /** + * 生产物料规格 + */ + private String produceMaterialSpec; + + /** + * 单位时间 + */ + @Excel(name = "单位时间") + private Long productionTime; + + /** + * 前置生产工单ID + */ + @Excel(name = "前置生产工单ID") + private Long preOrderId; + + /** + * 前置生产工单编号 + */ + @Excel(name = "前置生产工单编号") + private String preOrderCode; + + /** MesProductPlan主键标识 */ + private Long planId; + + /** + * MesProductPlan计划编号 + */ + private String planCode; + + /** + * 时间范围-计划开始结束时间 + */ + private List planDateRange; + + public List getPlanDateRange() { + return planDateRange; + } + + public void setPlanDateRange(List planDateRange) { + this.planDateRange = planDateRange; + } + + public Long getPlanId() { + return planId; + } + + public void setPlanId(Long planId) { + this.planId = planId; + } + + public String getPlanCode() { + return planCode; + } + + public void setPlanCode(String planCode) { + this.planCode = planCode; + } + + public String getPreOrderCode() { + return preOrderCode; + } + + public void setPreOrderCode(String preOrderCode) { + this.preOrderCode = preOrderCode; + } + + public Long getPreOrderId() { + return preOrderId; + } + + public void setPreOrderId(Long preOrderId) { + this.preOrderId = preOrderId; + } + + public Long getProductionTime() { + return productionTime; + } + + public void setProductionTime(Long productionTime) { + this.productionTime = productionTime; + } + + public String getMaterialBomDesc() { + return materialBomDesc; + } + + public void setMaterialBomDesc(String materialBomDesc) { + this.materialBomDesc = materialBomDesc; + } + + public String getDispatchName() { + return dispatchName; + } + + public void setDispatchName(String dispatchName) { + this.dispatchName = dispatchName; + } + + + + public Date getPlanDeliveryDate() { + return planDeliveryDate; + } + + public void setPlanDeliveryDate(Date planDeliveryDate) { + this.planDeliveryDate = planDeliveryDate; + } + + public String getSaleOrderFlag() { + return saleOrderFlag; + } + + public void setSaleOrderFlag(String saleOrderFlag) { + this.saleOrderFlag = saleOrderFlag; + } + + public void setProductOrderId(Long productOrderId) { + this.productOrderId = productOrderId; + } + + public Long getProductOrderId() { + return productOrderId; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getOrderCode() { + return orderCode; + } + + public void setSaleOrderId(Long saleOrderId) { + this.saleOrderId = saleOrderId; + } + + public Long getSaleOrderId() { + return saleOrderId; + } + + public void setSaleorderCode(String saleorderCode) { + this.saleorderCode = saleorderCode; + } + + public String getSaleorderCode() { + return saleorderCode; + } + + public void setSaleorderLinenumber(String saleorderLinenumber) { + this.saleorderLinenumber = saleorderLinenumber; + } + + public String getSaleorderLinenumber() { + return saleorderLinenumber; + } + + public void setProjectNo(String projectNo) { + this.projectNo = projectNo; + } + + public String getProjectNo() { + return projectNo; + } + + public String getSaleType() { + return saleType; + } + + public void setSaleType(String saleType) { + this.saleType = saleType; + } + + public void setMaterialId(Long materialId) { + this.materialId = materialId; + } + + public Long getMaterialId() { + return materialId; + } + + public void setMaterialBomId(Long materialBomId) { + this.materialBomId = materialBomId; + } + + public Long getMaterialBomId() { + return materialBomId; + } + + public Long getProduceMaterialId() { + return produceMaterialId; + } + + public void setProduceMaterialId(Long produceMaterialId) { + this.produceMaterialId = produceMaterialId; + } + + public void setDispatchType(String dispatchType) { + this.dispatchType = dispatchType; + } + + public String getDispatchType() { + return dispatchType; + } + + public void setDispatchId(Long dispatchId) { + this.dispatchId = dispatchId; + } + + public Long getDispatchId() { + return dispatchId; + } + + public String getCabinetChannel() { + return cabinetChannel; + } + + public void setCabinetChannel(String cabinetChannel) { + this.cabinetChannel = cabinetChannel; + } + + public void setSaleAmount(BigDecimal saleAmount) { + this.saleAmount = saleAmount; + } + + public BigDecimal getSaleAmount() { + return saleAmount; + } + + public void setPlanAmount(BigDecimal planAmount) { + this.planAmount = planAmount; + } + + public BigDecimal getPlanAmount() { + return planAmount; + } + + public void setDispatchAmount(BigDecimal dispatchAmount) { + this.dispatchAmount = dispatchAmount; + } + + public BigDecimal getDispatchAmount() { + return dispatchAmount; + } + + public void setCompleteAmount(BigDecimal completeAmount) { + this.completeAmount = completeAmount; + } + + public BigDecimal getCompleteAmount() { + return completeAmount; + } + + public void setReleaseTime(Date releaseTime) { + this.releaseTime = releaseTime; + } + + public Date getReleaseTime() { + return releaseTime; + } + + public void setPlanBeginTime(Date planBeginTime) { + this.planBeginTime = planBeginTime; + } + + public Date getPlanBeginTime() { + return planBeginTime; + } + + public void setPlanEndTime(Date planEndTime) { + this.planEndTime = planEndTime; + } + + public Date getPlanEndTime() { + return planEndTime; + } + + public void setRealBeginTime(Date realBeginTime) { + this.realBeginTime = realBeginTime; + } + + public Date getRealBeginTime() { + return realBeginTime; + } + + public void setRealEndTime(Date realEndTime) { + this.realEndTime = realEndTime; + } + + public Date getRealEndTime() { + return realEndTime; + } + + public void setOrderStatus(String orderStatus) { + this.orderStatus = orderStatus; + } + + public String getOrderStatus() { + return orderStatus; + } + + public void setStockLockFlag(String stockLockFlag) { + this.stockLockFlag = stockLockFlag; + } + + public String getStockLockFlag() { + return stockLockFlag; + } + + public String getMaterialCode() { + return materialCode; + } + + public void setMaterialCode(String materialCode) { + this.materialCode = materialCode; + } + + public String getMaterialName() { + return materialName; + } + + public void setMaterialName(String materialName) { + this.materialName = materialName; + } + + + public String getMaterialSpec() { + return materialSpec; + } + + public void setMaterialSpec(String materialSpec) { + this.materialSpec = materialSpec; + } + + public String getProduceMaterialCode() { + return produceMaterialCode; + } + + public void setProduceMaterialCode(String produceMaterialCode) { + this.produceMaterialCode = produceMaterialCode; + } + + public String getProduceMaterialName() { + return produceMaterialName; + } + + public void setProduceMaterialName(String produceMaterialName) { + this.produceMaterialName = produceMaterialName; + } + + public String getProduceMaterialSpec() { + return produceMaterialSpec; + } + + public void setProduceMaterialSpec(String produceMaterialSpec) { + this.produceMaterialSpec = produceMaterialSpec; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("productOrderId", getProductOrderId()) + .append("orderCode", getOrderCode()) + .append("saleOrderId", getSaleOrderId()) + .append("saleorderCode", getSaleorderCode()) + .append("saleorderLinenumber", getSaleorderLinenumber()) + .append("projectNo", getProjectNo()) + .append("materialId", getMaterialId()) + .append("materialBomId", getMaterialBomId()) + .append("dispatchType", getDispatchType()) + .append("dispatchId", getDispatchId()) + .append("saleAmount", getSaleAmount()) + .append("planAmount", getPlanAmount()) + .append("dispatchAmount", getDispatchAmount()) + .append("completeAmount", getCompleteAmount()) + .append("releaseTime", getReleaseTime()) + .append("planBeginTime", getPlanBeginTime()) + .append("planEndTime", getPlanEndTime()) + .append("realBeginTime", getRealBeginTime()) + .append("realEndTime", getRealEndTime()) + .append("orderStatus", getOrderStatus()) + .append("stockLockFlag", getStockLockFlag()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductInstock.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductInstock.java index ab3c54f1..b39463c0 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductInstock.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductInstock.java @@ -163,6 +163,7 @@ public class WmsProductInstock extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "结束时间;agv处理结束时间", width = 30, dateFormat = "yyyy-MM-dd") private Date endTime; + private Date day; /** 同步ERP状态(0:失败,1成功) */ @Excel(name = "同步ERP状态(0:失败,1成功)") @@ -453,6 +454,13 @@ public class WmsProductInstock extends BaseEntity { public Date getEndTime() { return endTime; } + public void setDay(Date day) { + this.day = day; + } + + public Date getDay() { + return day; + } public String getErpStatus() { return erpStatus; diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsBaseLocationMapper.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsBaseLocationMapper.java index 632367e3..94325f2b 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsBaseLocationMapper.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsBaseLocationMapper.java @@ -101,4 +101,20 @@ public interface WmsBaseLocationMapper int selectAllProductLocation(); int selectAllProductEmptyLocation(); + + int stockAmount(); + + int nostockAmount(); + + Integer selectFourthLocation(); + + Integer selectFourthNostockLocation(); + + int productstockAmount(); + + int noProductstockAmount(); + + Integer selectFourthFustockLocation(); + + Integer selectFourthNoFustockLocation(); } diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsProductInstockMapper.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsProductInstockMapper.java index e8988211..04a5b512 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsProductInstockMapper.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsProductInstockMapper.java @@ -100,4 +100,8 @@ public interface WmsProductInstockMapper List selectWmsProductInstockJoinList(WmsProductInstock wmsProductInstock); List locationCount(); + + List productInInfo(); + + List productFirstInInfo(); } diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsProductOutstockMapper.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsProductOutstockMapper.java index 03502502..c17b5850 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsProductOutstockMapper.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsProductOutstockMapper.java @@ -1,5 +1,6 @@ package com.hw.wms.mapper; +import java.math.BigDecimal; import java.util.List; import com.hw.wms.domain.WmsProductOutstock; import com.hw.wms.domain.WmsProductOutstockDetail; @@ -145,4 +146,8 @@ public interface WmsProductOutstockMapper List locationCount(); List scheduleTask(); + + BigDecimal todayOutstockAmount(); + + BigDecimal monthOutstockAmount(); } diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsProductStockMapper.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsProductStockMapper.java index 64e8d50d..29b6e3c9 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsProductStockMapper.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsProductStockMapper.java @@ -157,4 +157,6 @@ public interface WmsProductStockMapper int selectTotalLocation(); int selectOpplyLocation(); + + BigDecimal monthInstockAmount(); } diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsRawInstockMapper.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsRawInstockMapper.java index 63e0d088..9f548e91 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsRawInstockMapper.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsRawInstockMapper.java @@ -3,8 +3,11 @@ package com.hw.wms.mapper; import java.math.BigDecimal; import java.util.List; +import com.hw.wms.domain.MesProductOrder; import com.hw.wms.domain.WmsProductInstock; import com.hw.wms.domain.WmsRawInstock; +import com.hw.wms.domain.WmsRawOutstock; +import org.apache.ibatis.annotations.Param; /** * 原材料入库记录Mapper接口 @@ -92,4 +95,16 @@ public interface WmsRawInstockMapper BigDecimal monthRawInAmount(); + + List selectInAndOutInfo(); + + List fourthInstockList(); + + List purchaseInfo(); + + List bomInfo(@Param("dispatchId") int dispatchId); + + List purchaseFirstInfo(); + + BigDecimal dayRawInAmount(); } diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsRawOutstockMapper.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsRawOutstockMapper.java index 4c171af4..6c5d74de 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsRawOutstockMapper.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsRawOutstockMapper.java @@ -2,6 +2,8 @@ package com.hw.wms.mapper; import java.math.BigDecimal; import java.util.List; + +import com.hw.wms.domain.WmsProductInstock; import com.hw.wms.domain.WmsRawOutstock; import com.hw.wms.domain.WmsRawOutstockDetail; @@ -160,4 +162,16 @@ public interface WmsRawOutstockMapper BigDecimal monthRawOutAmount(); List productPlan(); + + List selectInAndOutInfo(); + + List fourthOutstockList(); + + List productOutInfo(); + + List productFirstOutInfo(); + + BigDecimal dayRawInAmount(); + + BigDecimal dayRawOutAmount(); } diff --git a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsBaseLocationMapper.xml b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsBaseLocationMapper.xml index e65748c1..9253cc98 100644 --- a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsBaseLocationMapper.xml +++ b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsBaseLocationMapper.xml @@ -300,7 +300,8 @@ order by location_code SELECT x.* FROM `hwjy-cloud`.wms_base_location x where x.warehouse_id = 531 + + + + + + + + diff --git a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductInstockMapper.xml b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductInstockMapper.xml index 03367ebd..bcfd9463 100644 --- a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductInstockMapper.xml +++ b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductInstockMapper.xml @@ -306,4 +306,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" apply_date > now() - interval 1 month and warehouse_id = 531 + + diff --git a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductOutstockMapper.xml b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductOutstockMapper.xml index 9d6b89fd..861c3b2e 100644 --- a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductOutstockMapper.xml +++ b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductOutstockMapper.xml @@ -413,6 +413,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + update wms_product_outstock diff --git a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductStockMapper.xml b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductStockMapper.xml index 0b549631..0badad0e 100644 --- a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductStockMapper.xml +++ b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductStockMapper.xml @@ -384,7 +384,7 @@ +