|
@@ -1789,7 +1789,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
|
|
InOutWarehouseTask inOutWarehouseTask = inOutWarehouseTaskService.selectOne(inOutWarehouseTaskWrapper);
|
|
InOutWarehouseTask inOutWarehouseTask = inOutWarehouseTaskService.selectOne(inOutWarehouseTaskWrapper);
|
|
if (inOutWarehouseTask!=null){
|
|
if (inOutWarehouseTask!=null){
|
|
//自运出库时手动加的车
|
|
//自运出库时手动加的车
|
|
- if("1".equals(warehouseInOutInfo.getSelfLoading())) {
|
|
|
|
|
|
+ if("1".equals(warehouseInOutInfo.getSelfLoading())||warehouseInOutInfo.getTranCarNo() == null||warehouseInOutInfo.getCarId() == null) {
|
|
List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
|
|
List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
|
|
.eq("contract_no", warehouseInOutInfo.getContractNo()).eq("tran_type", "1")
|
|
.eq("contract_no", warehouseInOutInfo.getContractNo()).eq("tran_type", "1")
|
|
.orderBy("create_date",false));
|
|
.orderBy("create_date",false));
|
|
@@ -1841,6 +1841,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
|
|
tranCarInfo.setContractNo(warehouseInOutInfo.getContractNo());
|
|
tranCarInfo.setContractNo(warehouseInOutInfo.getContractNo());
|
|
tranCarInfo.setStatusFlag(StatusEnum.LOADED.getFlag());
|
|
tranCarInfo.setStatusFlag(StatusEnum.LOADED.getFlag());
|
|
tranCarInfo.setStatus(StatusEnum.LOADED.getName());
|
|
tranCarInfo.setStatus(StatusEnum.LOADED.getName());
|
|
|
|
+ warehouseInOutInfo.setSelfLoading("1");
|
|
warehouseInOutInfo.setCarId(tranCarInfo.getId());
|
|
warehouseInOutInfo.setCarId(tranCarInfo.getId());
|
|
warehouseInOutInfo.setTranCarNo(tranCarNo);
|
|
warehouseInOutInfo.setTranCarNo(tranCarNo);
|
|
warehouseInOutInfoService.updateById(warehouseInOutInfo);
|
|
warehouseInOutInfoService.updateById(warehouseInOutInfo);
|