1

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

@@ -678,28 +678,6 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 stockPurchaseReceiptReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());
                                 stockPurchaseReceiptReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
                                 stockPurchaseReceiptReportService.insert(stockPurchaseReceiptReport);
-                                Wrapper wrapper = new EntityWrapper<TranCarInfo>()
-                                        .eq("contract_no", warehouseInOutInfo.getContractNo())
-                                        .eq("car_no", warehouseInOutInfo.getCarNo())
-                                        .eq(TranCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0);
-                                if(warehouseInOutInfo.getTranCarNo() != null && !warehouseInOutInfo.getTranCarNo().isEmpty()){
-                                    wrapper.eq("tran_car_no",warehouseInOutInfo.getTranCarNo());
-                                }
-                                TranCarInfo tranCarInfo = tranCarInfoService.selectOne(wrapper);
-                                if (tranCarInfo != null) {
-                                    //将到货数据同步到派车表
-                                    tranCarInfo.setUnloadNetWeight(warehouseInOutInfo.getNetWeight());
-                                    tranCarInfo.setUnloadPoundImg(warehouseInOutInfo.getAddressUrl());
-//                                    tranCarInfo.setDeductionAmount(warehouseInOutInfo.getDeductionAmount());
-                                    tranCarInfo.setStatus(StatusEnum.DELIVERED.getName());
-                                    tranCarInfo.setStatusFlag(StatusEnum.DELIVERED.getFlag());
-                                    if ("1".equals(tranCarInfo.getSubmit())) {
-                                        throw new YException(YExceptionEnum.CARNO_SUBMITTED_ERROR);
-                                    } else {
-                                        tranCarInfo.setSubmit("1");
-                                    }
-                                    tranCarInfoService.updateById(tranCarInfo);
-                                }
                             }
                         }
 
@@ -854,8 +832,29 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         stockSaleReceiptReport.setAmountNotReceivable(stockSaleReceiptReport.getAmountIngReceivable());
                         stockSaleReceiptReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());
                         stockSaleReceiptReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
-
                         stockSaleReceiptReportService.insert(stockSaleReceiptReport);
+                        Wrapper wrapper = new EntityWrapper<TranCarInfo>()
+                                .eq("contract_no", warehouseInOutInfo.getContractNo())
+                                .eq("car_no", warehouseInOutInfo.getCarNo())
+                                .eq(TranCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0);
+                        if(warehouseInOutInfo.getTranCarNo() != null && !warehouseInOutInfo.getTranCarNo().isEmpty()){
+                            wrapper.eq("tran_car_no",warehouseInOutInfo.getTranCarNo());
+                        }
+                        TranCarInfo tranCarInfo = tranCarInfoService.selectOne(wrapper);
+                        if (tranCarInfo != null) {
+                            //将到货数据同步到派车表
+                            tranCarInfo.setUnloadNetWeight(warehouseInOutInfo.getNetWeight());
+                            tranCarInfo.setUnloadPoundImg(warehouseInOutInfo.getAddressUrl());
+//                                    tranCarInfo.setDeductionAmount(warehouseInOutInfo.getDeductionAmount());
+                            tranCarInfo.setStatus(StatusEnum.DELIVERED.getName());
+                            tranCarInfo.setStatusFlag(StatusEnum.DELIVERED.getFlag());
+                            if ("1".equals(tranCarInfo.getSubmit())) {
+                                throw new YException(YExceptionEnum.CARNO_SUBMITTED_ERROR);
+                            } else {
+                                tranCarInfo.setSubmit("1");
+                            }
+                            tranCarInfoService.updateById(tranCarInfo);
+                        }
                     }
                     //判断是否有货
                     if (warehouseBaseInfo != null) {
@@ -955,6 +954,28 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         stockSaleReceiptReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
 
                         stockSaleReceiptReportService.insert(stockSaleReceiptReport);
+                        Wrapper wrapper = new EntityWrapper<TranCarInfo>()
+                                .eq("contract_no", warehouseInOutInfo.getContractNo())
+                                .eq("car_no", warehouseInOutInfo.getCarNo())
+                                .eq(TranCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0);
+                        if(warehouseInOutInfo.getTranCarNo() != null && !warehouseInOutInfo.getTranCarNo().isEmpty()){
+                            wrapper.eq("tran_car_no",warehouseInOutInfo.getTranCarNo());
+                        }
+                        TranCarInfo tranCarInfo = tranCarInfoService.selectOne(wrapper);
+                        if (tranCarInfo != null) {
+                            //将到货数据同步到派车表
+                            tranCarInfo.setUnloadNetWeight(warehouseInOutInfo.getNetWeight());
+                            tranCarInfo.setUnloadPoundImg(warehouseInOutInfo.getAddressUrl());
+//                                    tranCarInfo.setDeductionAmount(warehouseInOutInfo.getDeductionAmount());
+                            tranCarInfo.setStatus(StatusEnum.DELIVERED.getName());
+                            tranCarInfo.setStatusFlag(StatusEnum.DELIVERED.getFlag());
+                            if ("1".equals(tranCarInfo.getSubmit())) {
+                                throw new YException(YExceptionEnum.CARNO_SUBMITTED_ERROR);
+                            } else {
+                                tranCarInfo.setSubmit("1");
+                            }
+                            tranCarInfoService.updateById(tranCarInfo);
+                        }
                     }
                     if (warehouseBaseInfo != null) {
                         //出库时打入成本