1

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

@@ -694,28 +694,6 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 workflowService.activateInstance(stockPurchaseReceiptReport.getWorkflowId(), stockPurchaseReceiptReport.getId());
                             }
                         }
-                        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());
-                            if (warehouseInOutInfo.getAddressUrl()!=null) {
-                                tranCarInfo.setUnloadPoundImg(warehouseInOutInfo.getAddressUrl());
-                            }
-                            tranCarInfo.setUnloadingDate(warehouseInOutInfo.getInOutDate());
-                            if ("2".equals(tranCarInfo.getSubmit())) {
-                                throw new YException(YExceptionEnum.CARNO_SUBMITTED_ERROR);
-                            } else {
-                                tranCarInfo.setSubmit("2");
-                            }
-                            tranCarInfoService.updateById(tranCarInfo);
-                        }
                     }
                     //常用库移库入库类型
                     else if ("3".equals(warehouseInOutInfo.getInOutTypeKey())) {
@@ -847,6 +825,28 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             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());
+                        if (warehouseInOutInfo.getAddressUrl()!=null) {
+                            tranCarInfo.setUnloadPoundImg(warehouseInOutInfo.getAddressUrl());
+                        }
+                        tranCarInfo.setUnloadingDate(warehouseInOutInfo.getInOutDate());
+                        if ("2".equals(tranCarInfo.getSubmit())) {
+                            throw new YException(YExceptionEnum.CARNO_SUBMITTED_ERROR);
+                        } else {
+                            tranCarInfo.setSubmit("2");
+                        }
+                        tranCarInfoService.updateById(tranCarInfo);
+                    }
                     //更新库存量
                     float original = 0f;
                     //判断是否有库