1

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

@@ -430,8 +430,8 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
             if (inOutWarehouseTask!=null){
                 if ("销售出库".equals(inOutWarehouseTask.getInOutType())){
                     expenseInfo.setCostType("运费-销售");
-                    expenseInfo.setStatusFlag(StatusEnum.COMPLETED.getFlag());
-                    expenseInfo.setStatus(StatusEnum.COMPLETED.getName());
+                    expenseInfo.setStatusFlag(StatusEnum.COST_PAID.getFlag());
+                    expenseInfo.setStatus(StatusEnum.COST_PAID.getName());
                 }
                 else if ("退库".equals(inOutWarehouseTask.getInOutType())){
                     expenseInfo.setCostType("运费-退库");

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

@@ -558,7 +558,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                                     .eq("comp_id", warehousingOrder2.getCompId())
                                     .eq("contract_no", warehousingOrder2.getContractNo())
                                     .eq("delete_flag", "0"));
-                            warehousingOrder.setGoodsSource(inOutWarehouseTask.getWarehouseName());
+                            warehousingOrder.setGoodsSource(warehousingOrder2.getGoodsSource());
                             //更新收货库库点库存 (所在仓库为入货库、所属仓库为原始货源仓库、货名一致)
                             ContractInventoryDistribution contractInventoryDistribution=contractInventoryDistributionService.selectOne(new EntityWrapper<ContractInventoryDistribution>()
                                     .eq("comp_id",warehousingOrder1.getCompId()).eq("inventory_type","3").eq("locus_warehouse",warehousingOrder1.getWarehouseName())
@@ -591,6 +591,9 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                                 contractInventoryDistributionService.updateById(contractInventoryDistribution1);
                             }
                         }
+                        else if ("移库入库".equals(warehousingOrder2.getInType())){
+                            warehousingOrder.setGoodsSource(warehousingOrder2.getGoodsSource());
+                        }
                         this.insert(warehousingOrder);
                     }
                 }