Merge remote-tracking branch 'origin/master'

# Conflicts:
#	op-modules/op-wms/src/main/java/com/op/wms/controller/BpProcureOrderController.java

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<MesReportWorkConsume> 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)){
-            BigDecimal actPro = mesReportWorkConsumeMapper.getActAllProduct(mesReportWorkConsume);
+            actPro = mesReportWorkConsumeMapper.getActAllProduct(mesReportWorkConsume);
             liblist0.get(0).setQuantityFeedback(actPro);
+
+            planPro = liblist0.get(0).getQuantitySplit();
         }
 
+        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<MesReportWorkConsume> 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);

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java

@@ -1276,7 +1276,7 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
         List<String> colNameArray = null;
         //数据列//cpkType,'-',q.ymdms
         Map<String, QcStaticTable> mxMapData = null;
-        List<QcCPKInfo> cpkTypeList = cpkTypeList = qcStaticTableMapper.getCpkTypeList(qcCPKInfo);
+        List<QcCPKInfo> 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);
                     }

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
     /**
      * 查询白坯原材料采购单列表
      */
-
+    @RequiresPermissions("wms:bpprocure:list")
     @GetMapping("/list")
     public TableDataInfo list(BpProcureOrder bpProcureOrder)
     {
@@ -48,7 +50,7 @@ public class BpProcureOrderController extends BaseController
     /**
      * 导出白坯原材料采购单列表
      */
-
+    @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
     /**
      * 获取白坯原材料采购单详细信息
      */
-
+    @RequiresPermissions("wms:bpprocure:query")
     @GetMapping(value = "/{ID}")
     public AjaxResult getInfo(@PathVariable("ID") String ID)
     {
@@ -71,7 +73,7 @@ public class BpProcureOrderController extends BaseController
     /**
      * 新增白坯原材料采购单
      */
-
+    @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
     /**
      * 修改白坯原材料采购单
      */
-
+    @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
     /**
      * 删除白坯原材料采购单
      */
-
+    @RequiresPermissions("wms:bpprocure:remove")
     @Log(title = "白坯原材料采购单", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{IDs}")
     public AjaxResult remove(@PathVariable String[] IDs)