1

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

@@ -351,16 +351,17 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
                                 contractExpensesInfo.setContractId(contractManagementInfo.getId());
                                 contractExpensesInfo.setContractNo(contractManagementInfo.getContractNo());
                                 contractExpensesInfo.setCostType("1");
+                                contractExpensesInfo.setWarehouseName(expenseInfo1.getWarehouseName());
                             }
-                            else {
-                                WarehouseBaseInfo warehouseBaseInfo=warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
-                                        .eq("warehouse_name",warehousingOrder.getWarehouseName())
-                                        .eq("comp_id",warehousingOrder.getCompId()));
-                                if (warehouseBaseInfo!=null) {
-                                    contractExpensesInfo.setWarehouseId(warehouseBaseInfo.getId());
-                                    contractExpensesInfo.setWarehouseName(warehouseBaseInfo.getWarehouseName());
-                                    contractExpensesInfo.setCostType("3");
-                                }
+                        }
+                        else if(warehousingOrder!=null&&"收购入库".equals(warehousingOrder.getInType())){
+                            WarehouseBaseInfo warehouseBaseInfo=warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
+                                    .eq("warehouse_name",warehousingOrder.getWarehouseName())
+                                    .eq("comp_id",warehousingOrder.getCompId()));
+                            if (warehouseBaseInfo!=null) {
+                                contractExpensesInfo.setWarehouseId(warehouseBaseInfo.getId());
+                                contractExpensesInfo.setWarehouseName(warehouseBaseInfo.getWarehouseName());
+                                contractExpensesInfo.setCostType("3");
                             }
                         }
                         contractExpensesInfoService.insert(contractExpensesInfo);

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

@@ -319,6 +319,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                     ContractInventoryDistribution contractInventoryDistribution1=new ContractInventoryDistribution();
                     contractInventoryDistribution1.setId(IdGenerator.generateUUID());
                     contractInventoryDistribution1.setCompId(warehousingOrder1.getCompId());
+                    contractInventoryDistribution1.setWarehouseId(warehousingOrder1.getBaseId());
                     contractInventoryDistribution1.setInventory(Double.valueOf(String.valueOf(warehousingOrder.getInWarehouseWeight())));
                     contractInventoryDistribution1.setWarehouse(warehousingOrder1.getWarehouseName());
                     contractInventoryDistribution1.setLocusWarehouse(warehousingOrder1.getWarehouseName());