库存汇总页面子单，货主修复

xqs
1 parent c3e3b11f
Showing 3 changed files with 24 additions and 14 deletions
src/main/java/com/huaheng/pc/inventory/InventoryMaterialSummary/controller/InventoryMaterialSummaryController.java
src/main/java/com/huaheng/pc/inventory/InventoryMaterialSummary/service/InventoryMaterialSummaryServiceImpl.java
src/main/resources/templates/inventory/inventoryMaterialSummary/inventoryMaterialSummary.html
@@ -70,22 +70,24 @@ public class InventoryMaterialSummaryController extends BaseController {
         lambdaQueryWrapper.ge(
                 StringUtils.isNotEmpty(createdBegin), InventoryMaterialSummary::getCreated, createdBegin)
                 .le(StringUtils.isNotEmpty(createdEnd), InventoryMaterialSummary::getCreated, createdEnd)//创建时间范围
-                //货主
-                .in(InventoryMaterialSummary::getCompanyCode, ShiroUtils.getCompanyCodeList())
                 //仓库
                 .eq(InventoryMaterialSummary::getWarehouseCode, ShiroUtils.getWarehouseCode())
                 //物料编码
                 .eq(StringUtils.isNotEmpty(inventoryMaterialSummary.getMaterialCode()), InventoryMaterialSummary::getMaterialCode, inventoryMaterialSummary.getMaterialCode())
                 //物料名称
-                .eq(StringUtils.isNotEmpty(inventoryMaterialSummary.getMaterialName()), InventoryMaterialSummary::getMaterialName, inventoryMaterialSummary.getMaterialName());
-        //.orderByAsc(InventoryMaterialSummary::getMaterialCode);
+                .eq(StringUtils.isNotEmpty(inventoryMaterialSummary.getMaterialName()), InventoryMaterialSummary::getMaterialName, inventoryMaterialSummary.getMaterialName())
+                //货主
+                .in(StringUtils.isEmpty(inventoryMaterialSummary.getCompanyCode()),InventoryMaterialSummary::getCompanyCode, ShiroUtils.getCompanyCodeList())
+                .eq(!StringUtils.isEmpty(inventoryMaterialSummary.getCompanyCode()),InventoryMaterialSummary::getCompanyCode,inventoryMaterialSummary.getCompanyCode());
+                //.orderByAsc(InventoryMaterialSummary::getMaterialCode);
         List<InventoryMaterialSummary> list = inventoryMaterialSummaryService.list(lambdaQueryWrapper);
+        if (list == null) {
+            list = Collections.emptyList();
+        }
         //筛选库存汇总数据的专用方法
         List<InventoryMaterialSummary> details = inventoryMaterialSummaryService.duplicateRemoval(list);
-        if (details == null) {
-            details = Collections.emptyList();
-        }
+
         return details;
@@ -104,7 +106,10 @@ public class InventoryMaterialSummaryController extends BaseController {
                 //仓库
                 .eq(InventoryMaterialSummary::getWarehouseCode, ShiroUtils.getWarehouseCode())
                 //物料编码
-                .eq(InventoryMaterialSummary::getMaterialCode, inventoryMaterialSummaryChild.getMaterialCode());
+                .eq(InventoryMaterialSummary::getMaterialCode, inventoryMaterialSummaryChild.getMaterialCode())
+                //货主
+                .eq(!StringUtils.isEmpty(inventoryMaterialSummaryChild.getCompanyCode()),InventoryMaterialSummary::getCompanyCode,inventoryMaterialSummaryChild.getCompanyCode())
+                .in(StringUtils.isEmpty(inventoryMaterialSummaryChild.getCompanyCode()),InventoryMaterialSummary::getCompanyCode, ShiroUtils.getCompanyCodeList());
         //.orderByDesc(InventoryMaterialSummary::getId);
         List<InventoryMaterialSummary> list = inventoryMaterialSummaryService.list(lambdaQueryWrapper);
@@ -23,8 +23,10 @@ public class InventoryMaterialSummaryServiceImpl extends ServiceImpl&lt;InventoryMa
      * */
     @Override
     public List<InventoryMaterialSummary> inventoryMaterialSummarySelect(List<InventoryMaterialSummary> inventoryMaterialSummaryList) {
+        if(inventoryMaterialSummaryList.size() < 1){
+            return inventoryMaterialSummaryList;
+        }
         /*以物料为条件把同物料数量全部相加，去重再展示*/
-
         //单物料条件，
         HashMap<String, InventoryMaterialSummary> map = new HashMap<String, InventoryMaterialSummary>();
         for (InventoryMaterialSummary bean : inventoryMaterialSummaryList) {
@@ -48,7 +50,9 @@ public class InventoryMaterialSummaryServiceImpl extends ServiceImpl&lt;InventoryMa
     * */
     @Override
     public List<InventoryMaterialSummary> duplicateRemoval(List<InventoryMaterialSummary> inventoryMaterialSummaryList){
-        /*********/
+        if(inventoryMaterialSummaryList.size() < 1){
+            return inventoryMaterialSummaryList;
+        }
         //先找货主和物料码相同的物料SKU相加得总数
         for(InventoryMaterialSummary o:inventoryMaterialSummaryList){
             BigDecimal numQty = BigDecimal.ZERO;
@@ -147,7 +147,7 @@
                     //传值
                     warehouseCode : $('#warehouseCode').val(),
                     materialCode: row.materialCode,
-                    //materialName: row.materialName,
+                    companyCode: row.companyCode,
                 },
                 columns: [
                     {
@@ -177,7 +177,7 @@
                     {
                         field: 'materialCode',
                         title: '物料编码',
-                        width: 150
+                        width: 120
                     },
                     {
                         field: 'materialName',
@@ -192,7 +192,7 @@
                     {
                         field: 'qty',
                         title: '库存数量',
-                        width: 80
+                        width: 70
                     },
                     {
                         field: 'materialUnit',
@@ -222,7 +222,8 @@
                     {
                         field: 'receiptCode',
                         title: '入库单编码',
-                        visible: true
+                        visible: true,
+                        width: 140
                     },
                     {
                         field: 'created',