修改

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranProcessInfoServiceImpl.java

@@ -458,7 +458,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
         String taskContent = "";
         List<String> roleIdList = Lists.newArrayList();
         roleIdList = roleResourceService.getBindRoleIdsByResourceIds(AuthSecurityUtils.getCurrentUserInfo().getCompId(),
-                Lists.newArrayList("vehicleDispatching-reprice"));
+                Lists.newArrayList("transportationInfo-Exe"));
         // 向下一步操作人发送任务通知
             taskContent =  staffName + "提交的运输单价等待审核";
         NoticeTaskInfo taskInfo = new NoticeTaskInfo();

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -143,7 +143,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                                         if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
                                             Float netWeight = 0f;
                                             for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
-                                                netWeight = netWeight + warehouse.getNetWeight();
+                                                //潮粮累计纯重，干粮累计净重
+                                                netWeight = netWeight + (warehouse.getPureWeight()!=null?warehouse.getPureWeight():warehouse.getNetWeight());
                                             }
                                             warehouseNumView.setGoodsName(warehouseInOutInfoAllList.get(0).getGoodsName());
                                             warehouseNumView.setInNetWeight(String.valueOf(netWeight));
@@ -179,7 +180,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                                                 .eq("status_flag", "3").eq("position_id", warehousePositionInfo.getId()).eq("in_out_flag", "1").eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
                                         if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
                                             for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
-                                                netWeight = netWeight + warehouse.getNetWeight();
+                                                //潮粮累计纯重，干粮累计净重
+                                                netWeight = netWeight + (warehouse.getPureWeight()!=null?warehouse.getPureWeight():warehouse.getNetWeight());
                                             }
                                             if (StringUtils.isEmpty(outNetWeight)) {
                                                 outNetWeight = "0";
@@ -240,7 +242,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                                 if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
                                     Float netWeight = 0f;
                                     for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
-                                        netWeight = netWeight + warehouse.getNetWeight();
+                                        //潮粮累计纯重，干粮累计净重
+                                        netWeight = netWeight + (warehouse.getPureWeight()!=null?warehouse.getPureWeight():warehouse.getNetWeight());
                                     }
                                     warehouseNumView.setGoodsName(warehouseInOutInfoAllList.get(0).getGoodsName());
                                     warehouseNumView.setInNetWeight(String.valueOf(netWeight));
@@ -267,7 +270,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                                         .eq("status_flag", "3").eq("base_id", warehouseBaseInfo.getId()).eq("in_out_flag", "1").eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
                                 if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
                                     for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
-                                        netWeight = netWeight + warehouse.getNetWeight();
+                                        //潮粮累计纯重，干粮累计净重
+                                        netWeight = netWeight + (warehouse.getPureWeight()!=null?warehouse.getPureWeight():warehouse.getNetWeight());
                                     }
                                     if (StringUtils.isEmpty(outNetWeight)) {
                                         outNetWeight = "0";

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseInventoryCountInfoServiceImpl.java

@@ -157,6 +157,7 @@ public class WarehouseInventoryCountInfoServiceImpl extends ServiceImpl<Warehous
             }
             warehouseInventoryCountInfoCopy.setCumulativeStockOut(outNetWeight);
             warehouseInventoryCountInfoCopy.setGoodsName(warehouseInventoryCountInfo.getGoodsName());
+            warehouseInventoryCountInfoCopy.setPhysicalInventory(inNetWeight-outNetWeight);
 
         }
         return warehouseInventoryCountInfoCopy;
@@ -179,8 +180,8 @@ public class WarehouseInventoryCountInfoServiceImpl extends ServiceImpl<Warehous
                 .eq("goods_name_key",warehouseInventoryCountInfo.getGoodsNameKey()));
         if (warehousePositionStorageInfo !=null){
             warehousePositionStorageInfo.setStorage(warehouseInventoryCountInfo.getPhysicalInventory());
+            warehousePositionStorageInfoService.updateById(warehousePositionStorageInfo);
         }
-        this.updateById(warehouseInventoryCountInfo);
         boolean one = this.insert(warehouseInventoryCountInfo);
         // 假如成功返回ok
         if (one) {

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseInventoryCountInfoMapper.xml

@@ -20,7 +20,7 @@
         cumulative_stock_in as cumulativeStockIn,
         cumulative_stock_out as cumulativeStockOut,
         surplus_inventory as surplusInventory,
-        physical_inventory as physicalinventory,
+        physical_inventory as physicalInventory,
         loss,
         inventory_ratio as inventoryRatio,
         quality_inspector as qualityInspector,