From d773d44507d3b8b553238b9f4ef140f439df0668 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Mon, 4 Nov 2024 23:54:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MesReportWorkConsumeServiceImpl.java | 23 ++++++++++++++----- .../impl/QcStaticTableServiceImpl.java | 8 +++---- 2 files changed, 21 insertions(+), 10 deletions(-) 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 f69c05e8a..4edda048b 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,15 +358,25 @@ 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)); + BigDecimal actPro = BigDecimal.ZERO; + BigDecimal planPro = BigDecimal.ZERO; + if(!CollectionUtils.isEmpty(liblist0)){ + actPro = mesReportWorkConsumeMapper.getActAllProduct(mesReportWorkConsume); + liblist0.get(0).setQuantityFeedback(actPro); + + planPro = liblist0.get(0).getQuantitySplit(); } - if(!CollectionUtils.isEmpty(liblist0)){ - BigDecimal actPro = mesReportWorkConsumeMapper.getActAllProduct(mesReportWorkConsume); - liblist0.get(0).setQuantityFeedback(actPro); + for(MesReportWorkConsume lib0:liblist0){ + //bom用量=单位数量/订单理论数量*报工数量 + lib0.setQuantitySplitBom(new BigDecimal(lib0.getErfmg()) + .divide(lib0.getQuantitySplit(),6,BigDecimal.ROUND_HALF_UP) + .multiply(actPro) + ); } + + pTabs.setLibList(liblist0); tabs.add(pTabs); @@ -379,7 +389,8 @@ public class MesReportWorkConsumeServiceImpl implements IMesReportWorkConsumeSer 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)); + lib.setQuantitySplitBom(actPro.multiply(new BigDecimal(lib.getErfmg())) + .divide(planPro,6,BigDecimal.ROUND_HALF_UP)); } sTabs.setLibList(liblist); tabs.add(sTabs); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java index 84038bf86..42b1db9ac 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java @@ -1276,7 +1276,7 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { List colNameArray = null; //数据列//cpkType,'-',q.ymdms Map mxMapData = null; - List cpkTypeList = cpkTypeList = qcStaticTableMapper.getCpkTypeList(qcCPKInfo); + List cpkTypeList = qcStaticTableMapper.getCpkTypeList(qcCPKInfo); if("day".equals(qcCPKInfo.getTableType())){//日报 colNameArray = this.getDayOfYear(qcCPKInfo.getYmArrayStart(),qcCPKInfo.getYmArrayEnd()); mxMapData = qcStaticTableMapper.getDLDataDay(qcCPKInfo); @@ -1344,9 +1344,9 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { dmap.put("date"+index,"0"); dmap.put("cpkAvg","0"); - dmap.put("lineName",""); - dmap.put("checkTypeName",""); - dmap.put("ruleName",""); +// dmap.put("lineName",""); +// dmap.put("checkTypeName",""); +// dmap.put("ruleName",""); serisedata.add(0.0); } From f22f64e54aa915599ff1b1c2ef344b7e8e09aca4 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Mon, 4 Nov 2024 23:59:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/wms/controller/BpProcureOrderController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BpProcureOrderController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BpProcureOrderController.java index 77da644f6..ffced267b 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/BpProcureOrderController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BpProcureOrderController.java @@ -2,7 +2,6 @@ package com.op.wms.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -23,7 +22,7 @@ import com.op.common.core.web.page.TableDataInfo; /** * 白坯原材料采购单Controller - * + * * @author ruoyi * @date 2024-11-04 */ From 84f2290dcd95cc3278289d09f3333e58fdc9da40 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 5 Nov 2024 00:03:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/controller/BpProcureOrderController.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BpProcureOrderController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BpProcureOrderController.java index ffced267b..69b18f7f3 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/BpProcureOrderController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BpProcureOrderController.java @@ -2,6 +2,8 @@ package com.op.wms.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.op.common.security.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -36,7 +38,7 @@ public class BpProcureOrderController extends BaseController /** * 查询白坯原材料采购单列表 */ - @PreAuthorize("@ss.hasPermi('wms:bpprocure:list')") + @RequiresPermissions("wms:bpprocure:list") @GetMapping("/list") public TableDataInfo list(BpProcureOrder bpProcureOrder) { @@ -48,7 +50,7 @@ public class BpProcureOrderController extends BaseController /** * 导出白坯原材料采购单列表 */ - @PreAuthorize("@ss.hasPermi('wms:bpprocure:export')") + @RequiresPermissions("wms:bpprocure:export") @Log(title = "白坯原材料采购单", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, BpProcureOrder bpProcureOrder) @@ -61,7 +63,7 @@ public class BpProcureOrderController extends BaseController /** * 获取白坯原材料采购单详细信息 */ - @PreAuthorize("@ss.hasPermi('wms:bpprocure:query')") + @RequiresPermissions("wms:bpprocure:query") @GetMapping(value = "/{ID}") public AjaxResult getInfo(@PathVariable("ID") String ID) { @@ -71,7 +73,7 @@ public class BpProcureOrderController extends BaseController /** * 新增白坯原材料采购单 */ - @PreAuthorize("@ss.hasPermi('wms:bpprocure:add')") + @RequiresPermissions("wms:bpprocure:add") @Log(title = "白坯原材料采购单", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody BpProcureOrder bpProcureOrder) @@ -82,7 +84,7 @@ public class BpProcureOrderController extends BaseController /** * 修改白坯原材料采购单 */ - @PreAuthorize("@ss.hasPermi('wms:bpprocure:edit')") + @RequiresPermissions("wms:bpprocure:edit") @Log(title = "白坯原材料采购单", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody BpProcureOrder bpProcureOrder) @@ -93,7 +95,7 @@ public class BpProcureOrderController extends BaseController /** * 删除白坯原材料采购单 */ - @PreAuthorize("@ss.hasPermi('wms:bpprocure:remove')") + @RequiresPermissions("wms:bpprocure:remove") @Log(title = "白坯原材料采购单", businessType = BusinessType.DELETE) @DeleteMapping("/{IDs}") public AjaxResult remove(@PathVariable String[] IDs)