修改

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

@@ -224,52 +224,6 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         }
                     }
 
-                    // 采购入库统计
-                    PurchaseReceiptReport purchaseReceiptReport = new PurchaseReceiptReport();
-                    // 采购订单
-                    PurchaseOrder purchaseOrder = purchaseOrderService.selectOne(new EntityWrapper<PurchaseOrder>().eq("contract_no", warehouseInOutInfo.getContractNo())
-                            .eq("delete_flag", "0"));
-
-                    purchaseReceiptReport.setId(IdGenerator.generateUUID());
-                    purchaseReceiptReport.setCompId(AuthSecurityUtils.getCurrentUserInfo().getCompId());
-                    purchaseReceiptReport.setContractNo(warehouseInOutInfo.getContractNo());
-                    purchaseReceiptReport.setGoodsName(warehouseInOutInfo.getGoodsName());
-                    purchaseReceiptReport.setGoodsNameKey(warehouseInOutInfo.getGoodsNameKey());
-                    purchaseReceiptReport.setPositionNumber(warehouseInOutInfo.getBinNumber());
-                    purchaseReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
-                    purchaseReceiptReport.setWarehousingDate(warehouseInOutInfo.getInOutDate());
-                    purchaseReceiptReport.setProtein(warehouseInOutInfo.getProtein());
-                    purchaseReceiptReport.setWaterContent(warehouseInOutInfo.getWaterContent());
-                    purchaseReceiptReport.setUnitPrice(warehouseInOutInfo.getUnitPrice());
-                    purchaseReceiptReport.setDeductionAmount(Float.valueOf(warehouseInOutInfo.getDeductionAmount()));
-                    purchaseReceiptReport.setNetWeight(warehouseInOutInfo.getNetWeight());
-                    purchaseReceiptReport.setDeductionItems(warehouseInOutInfo.getDeductionItems());
-                    purchaseReceiptReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
-                    purchaseReceiptReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());
-                    purchaseReceiptReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
-                    if (purchaseOrder != null) {
-                        purchaseReceiptReport.setBasisPrice(purchaseOrder.getBasis());
-                        purchaseReceiptReport.setUnloadingCharge(purchaseOrder.getUnloadingCharge());
-                        purchaseReceiptReport.setInvoiceFee(purchaseOrder.getInvoiceFee());
-                        purchaseReceiptReport.setCustomerName(purchaseOrder.getSeller());
-                        purchaseReceiptReport.setInvoiceType(purchaseOrder.getType());
-                        purchaseReceiptReport.setInvoiceTypeKey(purchaseOrder.getType());
-                    }
-
-                    // 客户确认
-                    TranCarInfo tranCarInfo = tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
-                            .eq("contract_no", warehouseInOutInfo.getContractNo())
-                            .eq("car_no", warehouseInOutInfo.getCarNo())
-                            .eq("delete_flag", "0"));
-                    if (tranCarInfo != null&& "3".equals(tranCarInfo.getConfirmFlag())) {
-                        purchaseReceiptReport.setCustomerConfirmationStatusFlag("1");
-                        purchaseReceiptReport.setCustomerConfirmationStatus("是");
-                    } else {
-                        purchaseReceiptReport.setCustomerConfirmationStatusFlag("3");
-                        purchaseReceiptReport.setCustomerConfirmationStatus("否");
-                    }
-                    purchaseReceiptReportService.insert(purchaseReceiptReport);
-
 //                    boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(purchaseReceiptReport.getWorkflowId());
 //                    // 不是退回的单子
 //                    if (isStartWorkflow) {
@@ -314,48 +268,6 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 // 更新库存量
                                 warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage() - warehouseInOutInfo.getNetWeight());
                                 warehousePositionStorageInfoService.updateById(warehousePositionStorageInfo);
-                                // 销售出库统计
-                                SalesDeliveryReport salesDeliveryReport = new SalesDeliveryReport();
-                                salesDeliveryReport.setId(IdGenerator.generateUUID());
-                                salesDeliveryReport.setCompId(AuthSecurityUtils.getCurrentUserInfo().getCompId());
-                                salesDeliveryReport.setContractNo(warehouseInOutInfo.getContractNo());
-                                salesDeliveryReport.setGoodsName(warehouseInOutInfo.getGoodsName());
-                                salesDeliveryReport.setGoodsNameKey(warehouseInOutInfo.getGoodsNameKey());
-                                salesDeliveryReport.setPositionNumber(warehouseInOutInfo.getBinNumber());
-                                salesDeliveryReport.setCarNo(warehouseInOutInfo.getCarNo());
-                                salesDeliveryReport.setRetrievalDate(warehouseInOutInfo.getInOutDate());
-                                salesDeliveryReport.setProtein(warehouseInOutInfo.getProtein());
-                                salesDeliveryReport.setWaterContent(warehouseInOutInfo.getWaterContent());
-                                salesDeliveryReport.setUnitPrice(warehouseInOutInfo.getUnitPrice());
-                                salesDeliveryReport.setNetWeight(warehouseInOutInfo.getNetWeight());
-                                salesDeliveryReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
-                                salesDeliveryReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());
-                                salesDeliveryReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
-
-                                // 销售订单
-                                SaleOrder saleOrder = saleOrderService.selectOne(new EntityWrapper<SaleOrder>().eq("contract_no", warehouseInOutInfo.getContractNo())
-                                        .eq("delete_flag", "0"));
-
-                                if (saleOrder != null) {
-                                    salesDeliveryReport.setBasisPrice(saleOrder.getBasis());
-                                    salesDeliveryReport.setInvoiceFee(saleOrder.getInvoiceFee());
-                                    salesDeliveryReport.setCustomerName(saleOrder.getBuyer());
-                                }
-
-                                // 客户确认
-                                TranCarInfo tranCarInfo = tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
-                                        .eq("contract_no", warehouseInOutInfo.getContractNo())
-                                        .eq("car_no", warehouseInOutInfo.getCarNo())
-                                        .eq("delete_flag", "0"));
-                                if (tranCarInfo != null&& "3".equals(tranCarInfo.getConfirmFlag())) {
-                                    salesDeliveryReport.setCustomerConfirmationStatusFlag("1");
-                                    salesDeliveryReport.setCustomerConfirmationStatus("是");
-                                } else {
-                                    salesDeliveryReport.setCustomerConfirmationStatusFlag("3");
-                                    salesDeliveryReport.setCustomerConfirmationStatus("否");
-                                }
-                                salesDeliveryReportService.insert(salesDeliveryReport);
-
                             }
                             //出库量大于库存量
                             else {
@@ -455,6 +367,51 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         warehouseInOutDetail.setId(IdGenerator.generateUUID());
                         warehouseInOutDetailService.insert(warehouseInOutDetail);
                     }
+                    // 采购入库统计
+                    PurchaseReceiptReport purchaseReceiptReport = new PurchaseReceiptReport();
+                    // 采购订单
+                    PurchaseOrder purchaseOrder = purchaseOrderService.selectOne(new EntityWrapper<PurchaseOrder>().eq("contract_no", warehouseInOutInfo.getContractNo())
+                            .eq("delete_flag", "0"));
+
+                    purchaseReceiptReport.setId(IdGenerator.generateUUID());
+                    purchaseReceiptReport.setCompId(AuthSecurityUtils.getCurrentUserInfo().getCompId());
+                    purchaseReceiptReport.setContractNo(warehouseInOutInfo.getContractNo());
+                    purchaseReceiptReport.setGoodsName(warehouseInOutInfo.getGoodsName());
+                    purchaseReceiptReport.setGoodsNameKey(warehouseInOutInfo.getGoodsNameKey());
+                    purchaseReceiptReport.setPositionNumber(warehouseInOutInfo.getBinNumber());
+                    purchaseReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
+                    purchaseReceiptReport.setWarehousingDate(warehouseInOutInfo.getInOutDate());
+                    purchaseReceiptReport.setProtein(warehouseInOutInfo.getProtein());
+                    purchaseReceiptReport.setWaterContent(warehouseInOutInfo.getWaterContent());
+                    purchaseReceiptReport.setUnitPrice(warehouseInOutInfo.getUnitPrice());
+                    purchaseReceiptReport.setDeductionAmount(Float.valueOf(warehouseInOutInfo.getDeductionAmount()));
+                    purchaseReceiptReport.setNetWeight(warehouseInOutInfo.getNetWeight());
+                    purchaseReceiptReport.setDeductionItems(warehouseInOutInfo.getDeductionItems());
+                    purchaseReceiptReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
+                    purchaseReceiptReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());
+                    purchaseReceiptReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
+                    if (purchaseOrder != null) {
+                        purchaseReceiptReport.setBasisPrice(purchaseOrder.getBasis());
+                        purchaseReceiptReport.setUnloadingCharge(purchaseOrder.getUnloadingCharge());
+                        purchaseReceiptReport.setInvoiceFee(purchaseOrder.getInvoiceFee());
+                        purchaseReceiptReport.setCustomerName(purchaseOrder.getSeller());
+                        purchaseReceiptReport.setInvoiceType(purchaseOrder.getType());
+                        purchaseReceiptReport.setInvoiceTypeKey(purchaseOrder.getType());
+                    }
+
+                    // 客户确认
+                    TranCarInfo tranCarInfo1 = tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
+                            .eq("contract_no", warehouseInOutInfo.getContractNo())
+                            .eq("car_no", warehouseInOutInfo.getCarNo())
+                            .eq("delete_flag", "0"));
+                    if (tranCarInfo1 != null&& "3".equals(tranCarInfo1.getConfirmFlag())) {
+                        purchaseReceiptReport.setCustomerConfirmationStatusFlag("1");
+                        purchaseReceiptReport.setCustomerConfirmationStatus("是");
+                    } else {
+                        purchaseReceiptReport.setCustomerConfirmationStatusFlag("3");
+                        purchaseReceiptReport.setCustomerConfirmationStatus("否");
+                    }
+                    purchaseReceiptReportService.insert(purchaseReceiptReport);
                 }
                 //App端出库
                 else if ("0".equals(warehouseInOutInfo.getPcFlag())&&"出库任务".equals(warehouseInOutInfo.getTaskType())) {
@@ -476,6 +433,47 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         warehouseInOutDetail.setId(IdGenerator.generateUUID());
                         warehouseInOutDetailService.insert(warehouseInOutDetail);
                     }
+                    // 销售出库统计
+                    SalesDeliveryReport salesDeliveryReport = new SalesDeliveryReport();
+                    salesDeliveryReport.setId(IdGenerator.generateUUID());
+                    salesDeliveryReport.setCompId(AuthSecurityUtils.getCurrentUserInfo().getCompId());
+                    salesDeliveryReport.setContractNo(warehouseInOutInfo.getContractNo());
+                    salesDeliveryReport.setGoodsName(warehouseInOutInfo.getGoodsName());
+                    salesDeliveryReport.setGoodsNameKey(warehouseInOutInfo.getGoodsNameKey());
+                    salesDeliveryReport.setPositionNumber(warehouseInOutInfo.getBinNumber());
+                    salesDeliveryReport.setCarNo(warehouseInOutInfo.getCarNo());
+                    salesDeliveryReport.setRetrievalDate(warehouseInOutInfo.getInOutDate());
+                    salesDeliveryReport.setProtein(warehouseInOutInfo.getProtein());
+                    salesDeliveryReport.setWaterContent(warehouseInOutInfo.getWaterContent());
+                    salesDeliveryReport.setUnitPrice(warehouseInOutInfo.getUnitPrice());
+                    salesDeliveryReport.setNetWeight(warehouseInOutInfo.getNetWeight());
+                    salesDeliveryReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
+                    salesDeliveryReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());
+                    salesDeliveryReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
+
+                    // 销售订单
+                    SaleOrder saleOrder = saleOrderService.selectOne(new EntityWrapper<SaleOrder>().eq("contract_no", warehouseInOutInfo.getContractNo())
+                            .eq("delete_flag", "0"));
+
+                    if (saleOrder != null) {
+                        salesDeliveryReport.setBasisPrice(saleOrder.getBasis());
+                        salesDeliveryReport.setInvoiceFee(saleOrder.getInvoiceFee());
+                        salesDeliveryReport.setCustomerName(saleOrder.getBuyer());
+                    }
+
+                    // 客户确认
+                    TranCarInfo tranCarInfo1 = tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
+                            .eq("contract_no", warehouseInOutInfo.getContractNo())
+                            .eq("car_no", warehouseInOutInfo.getCarNo())
+                            .eq("delete_flag", "0"));
+                    if (tranCarInfo1 != null&& "3".equals(tranCarInfo1.getConfirmFlag())) {
+                        salesDeliveryReport.setCustomerConfirmationStatusFlag("1");
+                        salesDeliveryReport.setCustomerConfirmationStatus("是");
+                    } else {
+                        salesDeliveryReport.setCustomerConfirmationStatusFlag("3");
+                        salesDeliveryReport.setCustomerConfirmationStatus("否");
+                    }
+                    salesDeliveryReportService.insert(salesDeliveryReport);
                 }
                 warehouseInOutInfo.setStatusFlag(StatusEnum.SUBMITTED.getFlag());
                 warehouseInOutInfo.setStatus(StatusEnum.SUBMITTED.getName());