|
@@ -678,11 +678,14 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
|
|
|
stockPurchaseReceiptReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());
|
|
|
stockPurchaseReceiptReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
|
|
|
stockPurchaseReceiptReportService.insert(stockPurchaseReceiptReport);
|
|
|
-
|
|
|
- TranCarInfo tranCarInfo = tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
|
|
|
+ Wrapper wrapper = new EntityWrapper<TranCarInfo>()
|
|
|
.eq("contract_no", warehouseInOutInfo.getContractNo())
|
|
|
.eq("car_no", warehouseInOutInfo.getCarNo())
|
|
|
- .eq(TranCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
|
|
|
+ .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());
|