diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java index 892da1aa4..da240a0c0 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java @@ -602,19 +602,19 @@ public class MesReportWorkController extends BaseController { public List getNewPrepareData(@RequestBody MesPrepareDetail mesPrepareDetail) { return mesReportWorkService.getNewPrepareData(mesPrepareDetail); } - /**删除新增的报工物料组成**/ - @DeleteMapping("/deleteBomRowNow/{id}") - public AjaxResult deleteBomRowNow(@PathVariable String id) { - return toAjax(mesReportWorkService.deleteBomRowNow(id)); + /**删除新增的报工物料组成**/ + @DeleteMapping("/deleteBomRowNow/{id}") + public AjaxResult deleteBomRowNow(@PathVariable String id) { + return toAjax(mesReportWorkService.deleteBomRowNow(id)); + } + + /**删除报工数据**/ + @DeleteMapping("/deleteReportNow/{reportCode}") + public AjaxResult deleteReportNow(@PathVariable String reportCode) { + return toAjax(mesReportWorkService.deleteReportNow(reportCode)); } - /**删除报工数据**/ - @DeleteMapping("/deleteReportNow/{reportCode}") - public AjaxResult deleteReportNow(@PathVariable String reportCode) { - return toAjax(mesReportWorkService.deleteReportNow(reportCode)); - } - - //获取仓库下拉列表 + //获取仓库下拉列表 @GetMapping("/getWarehouseList") public List getWarehouseList(MesReportWorkConsume workConsume) { List rlist = mesReportWorkService.getWarehouseList(workConsume); diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java index 3861064c5..3fba4cd69 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java @@ -51,6 +51,9 @@ public class MesReportWorkConsume extends BaseEntity { @Excel(name = "数量") private BigDecimal quantity; + private BigDecimal quantitySplit; + private BigDecimal quantitySplitBom; + /** * 单位 */ @@ -391,6 +394,22 @@ public class MesReportWorkConsume extends BaseEntity { return id; } + public BigDecimal getQuantitySplit() { + return quantitySplit; + } + + public void setQuantitySplit(BigDecimal quantitySplit) { + this.quantitySplit = quantitySplit; + } + + public BigDecimal getQuantitySplitBom() { + return quantitySplitBom; + } + + public void setQuantitySplitBom(BigDecimal quantitySplitBom) { + this.quantitySplitBom = quantitySplitBom; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java index 44a56bb09..f69c05e8a 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java @@ -358,6 +358,9 @@ public class MesReportWorkConsumeServiceImpl implements IMesReportWorkConsumeSer pTabs.setTitle("第"+i+"层工单物料损耗"); mesReportWorkConsume.setParentOrder("0"); List liblist0 = mesReportWorkConsumeMapper.getConsumeList(mesReportWorkConsume); + for(MesReportWorkConsume lib0:liblist0){ + lib0.setQuantitySplitBom(lib0.getQuantity().divide(lib0.getQuantitySplit(),2,BigDecimal.ROUND_HALF_UP)); + } if(!CollectionUtils.isEmpty(liblist0)){ BigDecimal actPro = mesReportWorkConsumeMapper.getActAllProduct(mesReportWorkConsume); @@ -375,6 +378,9 @@ public class MesReportWorkConsumeServiceImpl implements IMesReportWorkConsumeSer sTabs.setTitle("第"+xh+"层工单物料损耗"); mesReportWorkConsume.setWorkorderCode(sonWorkOrder.getWorkorderCode()); List liblist = mesReportWorkConsumeMapper.getConsumeList(mesReportWorkConsume); + for(MesReportWorkConsume lib:liblist){ + lib.setQuantitySplitBom(lib.getQuantity().divide(lib.getQuantitySplit(),2,BigDecimal.ROUND_HALF_UP)); + } sTabs.setLibList(liblist); tabs.add(sTabs); diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareDetailMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareDetailMapper.xml index 9fe5b0b8d..64b4f86aa 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareDetailMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesPrepareDetailMapper.xml @@ -98,6 +98,7 @@ left join mes_prepare mp on ow.workorder_code = mp.workorder_code left join mes_prepare_detail mpd on mp.prepare_id = mpd.prepare_id where ow.product_date = #{productDateStr} + and mpd.material_name not like '%白坯%' and mpd.material_name not like '%药液%' and mpd.recoil = #{recoil} and mp.del_flag = '0' and mpd.del_flag = '0' GROUP BY mpd.material_code, mpd.material_name, diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml index f5b9d049d..1f79ffec8 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml @@ -111,7 +111,7 @@ mrwc.unit, mrwc.create_time createTime, mrwc.recoil, - pow.workorder_code_sap workorderCodeSap, + pow.workorder_code_sap workorderCodeSap,pow.quantity_split quantitySplit, mrwc.attr1, mrwc.warehouse_code warehouseCode, mpd.quantity planQuantity,mpd.erfmg,mpd.erfme, diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java index 77042c53c..635721097 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java @@ -521,4 +521,11 @@ public class QcCheckTaskIncomeController extends BaseController { task.setCheckType(taskInfo.getCheckType()); return toAjax(qcCheckTaskIncomeService.changeTaskDetail(task)); } + + //获取仓库下拉列表 + @GetMapping("/getWarehouseList") + public List getWarehouseList(QcCheckTaskIncome task) { + List rlist = qcCheckTaskIncomeService.getWarehouseList(task); + return rlist; + } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java index 3971ab337..524b16124 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java @@ -161,4 +161,6 @@ public interface QcCheckTaskIncomeMapper { void deleteTaskUser(String deleteIds); QcCheckTaskIncome getTaskInfoByRecordId(String recordId); + + List getWarehouseList(); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java index fae5392f3..a1c7ed1b8 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java @@ -117,4 +117,6 @@ public interface IQcCheckTaskIncomeService { QcCheckTaskIncome getTaskInfoByRecordId(String recordId); int changeTaskDetail(QcCheckTaskIncome task); + + List getWarehouseList(QcCheckTaskIncome task); } 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 ae8cbdc14..44807806f 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 @@ -1352,6 +1352,12 @@ public class QcCheckTaskIncomeServiceImpl implements return qcCheckTaskIncomeMapper.getOaUserId(getUserIdList); } + @Override + @DS("#header.poolName") + public List getWarehouseList(QcCheckTaskIncome task) { + return qcCheckTaskIncomeMapper.getWarehouseList(); + } + public static void main(String args[]){ String str = "11,,22,"; System.out.println(str.split(",")[0]); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskInventoryServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskInventoryServiceImpl.java index ac0f64bb4..5543b31db 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskInventoryServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskInventoryServiceImpl.java @@ -396,7 +396,7 @@ public class QcCheckTaskInventoryServiceImpl implements IQcCheckTaskInventorySer new LinkedBlockingQueue()); try { dateSources.forEach(dateSource -> { - if("ds_1000".equals(dateSource.get("poolName"))){ + if(!"ds_999".equals(dateSource.get("poolName"))){ logger.info("++++++++++++" + dateSource.get("poolName") + "++++库存检验开始++++++++++"); Runnable run = () -> createCCFunc(dateSource.get("poolName")); executorService.execute(run); diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml index a9b77507c..3886ad4d9 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml @@ -869,6 +869,12 @@ from qc_check_task qct where qct.record_id in('${ids}') + diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskInventoryMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskInventoryMapper.xml index 11b2b9bed..fd1f31f9f 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskInventoryMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskInventoryMapper.xml @@ -250,98 +250,67 @@ where CONVERT(varchar(10),create_time, 120) = CONVERT(varchar(10),GETDATE(), 120)