1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WarehouseBaseInfo.java

@@ -181,6 +181,11 @@ public class WarehouseBaseInfo extends BaseModel<WarehouseBaseInfo> {
      */
     @TableField(exist = false)
     private Integer tradeCount;
+    /**
+     * 出库信息数量包括已删除的
+     */
+    @TableField(exist = false)
+    private Integer outCount;
     @TableField(exist = false)
     private List<PurchasePrice> purchasePriceList;
     /**

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

@@ -1418,6 +1418,13 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 Integer dataCount1 = baseMapper.getCountByCondition(pageView1);
                 warehouseBaseInfo.setCount(dataCount);
                 warehouseBaseInfo.setTradeCount(dataCount1);
+                Map<String, Object> pageView2 = new HashMap<>();
+                pageView2.put("warehouseName", warehouseBaseInfo.getWarehouseName());
+                pageView2.put("compId", warehouseBaseInfo.getCompId());
+                pageView2.put("serviceManagementType","2");
+                // 查询出库信息包括已删除的
+                Integer dataCount2 = baseMapper.getCountByCondition(pageView2);
+                warehouseBaseInfo.setOutCount(dataCount2);
             }
         } else {
             String staffId = AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffId();
@@ -1455,6 +1462,13 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                         Integer dataCount1 = baseMapper.getCountByCondition(pageView1);
                         warehouseBaseInfo.setCount(dataCount);
                         warehouseBaseInfo.setTradeCount(dataCount1);
+                        Map<String, Object> pageView2 = new HashMap<>();
+                        pageView2.put("warehouseName", warehouseBaseInfo.getWarehouseName());
+                        pageView2.put("compId", warehouseBaseInfo.getCompId());
+                        pageView2.put("serviceManagementType","2");
+                        // 查询出库信息包括已删除的
+                        Integer dataCount2 = baseMapper.getCountByCondition(pageView2);
+                        warehouseBaseInfo.setOutCount(dataCount2);
                         warehouseBaseInfoList.add(warehouseBaseInfo);
                     }
                     break;

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

@@ -742,7 +742,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
 
                             if(contractManagementInfo.getUnitContractPrice()!=null) {
                                 BigDecimal cost = new BigDecimal(contractManagementInfo.getUnitContractPrice());
-                                BigDecimal deductionAmount = new BigDecimal(warehouseInOutInfo.getDeductionAmount());
+                                BigDecimal deductionAmount = new BigDecimal(warehouseInOutInfo.getDeductionAmount()!=null?warehouseInOutInfo.getDeductionAmount():0.0);
                                 stockPurchaseReceiptReport.setSettlementPrice(cost.subtract(deductionAmount).doubleValue());
                                 BigDecimal netWeight = new BigDecimal(warehouseInOutInfo.getNetWeight());
                                 stockPurchaseReceiptReport.setAmountIngPayable(cost.subtract(deductionAmount).multiply(netWeight).doubleValue());

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

@@ -381,6 +381,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         weighingManagement.setRelationId(relationId);
         weighingManagement.setTareDate(new Date());
         weighingManagement.setManagementType("3");
+        //出库类型
+        weighingManagement.setServiceManagementType("2");
         //状态改为已称皮重
         weighingManagement.setStatus(StatusEnum.TARED.getName());
         weighingManagement.setStatusFlag(StatusEnum.TARED.getFlag());

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

@@ -53,6 +53,7 @@
         q.relation_id as relationId,
         q.car_box_one as carBoxOne,
         q.car_box_two as carBoxTwo,
+        q.deduction_amount as deductionAmount,
         q.quality_inspector as qualityInspector,
         q.re_buckle_miscellaneous as reBuckleMiscellaneous,
         q.service_management_type as serviceManagementType,