1

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

@@ -2479,11 +2479,12 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
                         cell.setCellValue(editString("合同费用-保证金"));
                     }
                 } else if ("3".equals(expenseInfo1.getExpensesPurpose())) {
-                    if ("1".equals(expenseInfo1.getStorageFeeFlag())) {
-                        cell.setCellValue(editString("库点费用-仓储费"));
-                    } else {
-                        cell.setCellValue(editString( "库点费用-非粮款"));
-                    }
+                    cell.setCellValue(editString("库点费用-")+editString(expenseInfo1.getWareExpenseType()));
+//                    if ("1".equals(expenseInfo1.getStorageFeeFlag())) {
+//                        cell.setCellValue(editString("库点费用-仓储费"));
+//                    } else {
+//                        cell.setCellValue(editString( "库点费用-非粮款"));
+//                    }
                 } else if ("5".equals(expenseInfo1.getExpensesPurpose())) {
                     cell.setCellValue(editString("经营性费用"));
                 }else if("7".equals(expenseInfo1.getExpensesPurpose())){

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

@@ -4972,14 +4972,16 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                             .eq("comp_id", warehousingOrder.getCompId())
                                             .eq("contract_no", warehousingOrder.getContractNo())
                                             .eq("delete_flag", "0"));
-                                    //更新收货库库点库存剩余量 (所在仓库为出货库、所属仓库为原始货源仓库、货名一致)
-                                    ContractInventoryDistribution contractInventoryDistribution=contractInventoryDistributionService.selectOne(new EntityWrapper<ContractInventoryDistribution>()
-                                            .eq("comp_id",warehousingOrder.getCompId()).eq("inventory_type","3").eq("locus_warehouse",warehouseInOutInfo.getWarehouseName())
-                                            .eq("warehouse",inOutWarehouseTask1.getWarehouseName())
-                                            .eq("goods_name",warehouseInOutInfo.getGoodsName()));
-                                    if (contractInventoryDistribution!=null){
-                                        contractInventoryDistribution.setInventory(contractInventoryDistribution.getInventory()-warehouseInOutInfo.getNetWeight()*sourceRelationInfo.getProportion());
-                                        contractInventoryDistributionService.updateById(contractInventoryDistribution);
+                                    if(inOutWarehouseTask1!=null) {
+                                        //更新收货库库点库存剩余量 (所在仓库为出货库、所属仓库为原始货源仓库、货名一致)
+                                        ContractInventoryDistribution contractInventoryDistribution = contractInventoryDistributionService.selectOne(new EntityWrapper<ContractInventoryDistribution>()
+                                                .eq("comp_id", warehousingOrder.getCompId()).eq("inventory_type", "3").eq("locus_warehouse", warehouseInOutInfo.getWarehouseName())
+                                                .eq("warehouse", inOutWarehouseTask1.getWarehouseName())
+                                                .eq("goods_name", warehouseInOutInfo.getGoodsName()));
+                                        if (contractInventoryDistribution != null) {
+                                            contractInventoryDistribution.setInventory(contractInventoryDistribution.getInventory() - warehouseInOutInfo.getNetWeight() * sourceRelationInfo.getProportion());
+                                            contractInventoryDistributionService.updateById(contractInventoryDistribution);
+                                        }
                                     }
                                 }
                             }