Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

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

@@ -497,6 +497,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 warehousePositionStorageInfo1.setPositionId(warehouseInOutInfo.getPositionId());
                                 warehousePositionStorageInfo1.setBinNumber(warehouseInOutInfo.getBinNumber());
                                 warehousePositionStorageInfo1.setGoodsName(warehouseInOutInfo.getGoodsName());
+                                warehousePositionStorageInfo1.setGoodsNameKey(warehouseInOutInfo.getGoodsNameKey());
                                 warehousePositionStorageInfo1.setStorage(warehouseInOutInfo.getNetWeight());
                                 warehousePositionStorageInfoService.insert(warehousePositionStorageInfo1);
                             }
@@ -849,7 +850,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         // 不是退回的单子
                         if (isStartWorkflow) {
                             Workflow workflow = workflowService
-                                    .findLatestWorkflowByBusinessCodeByApp(saleOrder.getCompId(), "SALE-RECEIPT-REPORT");
+                                    .findLatestWorkflowByBusinessCodeByApp(salesDeliveryReport.getCompId(), "SALE-RECEIPT-REPORT");
                             // 没配置审核流程，直接结束并处理信息
                             if (workflow == null) {
                                 throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
@@ -890,7 +891,18 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         if ("出库任务".equals(warehouseInOutInfo.getTaskType())) {
                             stockSaleReceiptReport.setDeliveryDate(warehouseInOutInfo.getInOutDate());
                             stockSaleReceiptReport.setSettlementWeight(warehouseInOutInfo.getNetWeight());
-                            stockSaleReceiptReport.setAmountIngReceivable(warehouseInOutInfo.getUnitPrice() * stockSaleReceiptReport.getSettlementWeight());
+                            if(contractManagementInfo!=null){
+                                stockSaleReceiptReport.setAmountIngReceivable(Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())) * stockSaleReceiptReport.getSettlementWeight());
+                            }
+                            else{
+                                // 移库编号
+                                InOutWarehouseTask inOutWarehouseTask = inOutWarehouseTaskService.selectOne(new EntityWrapper<InOutWarehouseTask>()
+                                        .eq("move_task_no", warehouseInOutInfo.getContractNo())
+                                        .eq("delete_flag", "0"));
+                                if(inOutWarehouseTask!=null){
+                                    stockSaleReceiptReport.setAmountIngReceivable(inOutWarehouseTask.getUnitPrice() * stockSaleReceiptReport.getSettlementWeight());
+                                }
+                            }
                         } else if ("退库并出库".equals(warehouseInOutInfo.getTaskType())) {
                             stockSaleReceiptReport.setReturnDate(warehouseInOutInfo.getInOutDate());
                             stockSaleReceiptReport.setSettlementWeight(-warehouseInOutInfo.getNetWeight());
@@ -902,7 +914,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         // 不是退回的单子
                         if (isStartWorkflow) {
                             Workflow workflow = workflowService
-                                    .findLatestWorkflowByBusinessCodeByApp(saleOrder.getCompId(), "SALE-RECEIPT-REPORT");
+                                    .findLatestWorkflowByBusinessCodeByApp(stockSaleReceiptReport.getCompId(), "SALE-RECEIPT-REPORT");
                             // 没配置审核流程，直接结束并处理信息
                             if (workflow == null) {
                                 throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
@@ -975,6 +987,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 warehousePositionStorageInfo1.setPositionId(warehouseInOutInfo.getPositionId());
                                 warehousePositionStorageInfo1.setBinNumber(warehouseInOutInfo.getBinNumber());
                                 warehousePositionStorageInfo1.setGoodsName(warehouseInOutInfo.getGoodsName());
+                                warehousePositionStorageInfo1.setGoodsNameKey(warehouseInOutInfo.getGoodsNameKey());
                                 warehousePositionStorageInfo1.setStorage(warehouseInOutInfo.getNetWeight());
                                 warehousePositionStorageInfoService.insert(warehousePositionStorageInfo1);
                             }
@@ -1331,7 +1344,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         // 不是退回的单子
                         if (isStartWorkflow) {
                             Workflow workflow = workflowService
-                                    .findLatestWorkflowByBusinessCodeByApp(saleOrder.getCompId(), "SALE-RECEIPT-REPORT");
+                                    .findLatestWorkflowByBusinessCodeByApp(salesDeliveryReport.getCompId(), "SALE-RECEIPT-REPORT");
                             // 没配置审核流程，直接结束并处理信息
                             if (workflow == null) {
                                 throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
@@ -1365,12 +1378,34 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         if ("出库任务".equals(warehouseInOutInfo.getTaskType())) {
                             stockSaleReceiptReport.setDeliveryDate(warehouseInOutInfo.getInOutDate());
                             stockSaleReceiptReport.setSettlementWeight(warehouseInOutInfo.getNetWeight());
-                            stockSaleReceiptReport.setAmountIngReceivable(warehouseInOutInfo.getUnitPrice() * stockSaleReceiptReport.getSettlementWeight());
+                            if(contractManagementInfo!=null){
+                                stockSaleReceiptReport.setAmountIngReceivable(Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())) * stockSaleReceiptReport.getSettlementWeight());
+                            }
+                            else{
+                                // 移库编号
+                                InOutWarehouseTask inOutWarehouseTask = inOutWarehouseTaskService.selectOne(new EntityWrapper<InOutWarehouseTask>()
+                                        .eq("move_task_no", warehouseInOutInfo.getContractNo())
+                                        .eq("delete_flag", "0"));
+                                if(inOutWarehouseTask!=null){
+                                    stockSaleReceiptReport.setAmountIngReceivable(inOutWarehouseTask.getUnitPrice() * stockSaleReceiptReport.getSettlementWeight());
+                                }
+                            }
                         } else if ("退库并出库".equals(warehouseInOutInfo.getTaskType())) {
                             if ("1".equals(warehouseInOutInfo.getTaskTypeKey())) {
                                 stockSaleReceiptReport.setDeliveryDate(warehouseInOutInfo.getInOutDate());
                                 stockSaleReceiptReport.setSettlementWeight(warehouseInOutInfo.getNetWeight());
-                                stockSaleReceiptReport.setAmountIngReceivable(warehouseInOutInfo.getUnitPrice() * stockSaleReceiptReport.getSettlementWeight());
+                                if(contractManagementInfo!=null){
+                                    stockSaleReceiptReport.setAmountIngReceivable(Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())) * stockSaleReceiptReport.getSettlementWeight());
+                                }
+                                else{
+                                    // 移库编号
+                                    InOutWarehouseTask inOutWarehouseTask = inOutWarehouseTaskService.selectOne(new EntityWrapper<InOutWarehouseTask>()
+                                            .eq("move_task_no", warehouseInOutInfo.getContractNo())
+                                            .eq("delete_flag", "0"));
+                                    if(inOutWarehouseTask!=null){
+                                        stockSaleReceiptReport.setAmountIngReceivable(inOutWarehouseTask.getUnitPrice() * stockSaleReceiptReport.getSettlementWeight());
+                                    }
+                                }
                             } else if ("4".equals(warehouseInOutInfo.getTaskTypeKey())) {
                                 stockSaleReceiptReport.setReturnDate(warehouseInOutInfo.getInOutDate());
                                 stockSaleReceiptReport.setSettlementWeight(-warehouseInOutInfo.getNetWeight());
@@ -1390,7 +1425,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         // 不是退回的单子
                         if (isStartWorkflow) {
                             Workflow workflow = workflowService
-                                    .findLatestWorkflowByBusinessCodeByApp(saleOrder.getCompId(), "SALE-RECEIPT-REPORT");
+                                    .findLatestWorkflowByBusinessCodeByApp(stockSaleReceiptReport.getCompId(), "SALE-RECEIPT-REPORT");
                             // 没配置审核流程，直接结束并处理信息
                             if (workflow == null) {
                                 throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);