用车需求计算提货功能
This commit is contained in:
parent
5315175871
commit
62f05ffba9
@ -10,6 +10,8 @@ import java.io.UnsupportedEncodingException;
|
|||||||
import java.net.URLDecoder;
|
import java.net.URLDecoder;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
import org.jeecg.common.system.query.QueryGenerator;
|
import org.jeecg.common.system.query.QueryGenerator;
|
||||||
import org.jeecg.common.util.oConvertUtils;
|
import org.jeecg.common.util.oConvertUtils;
|
||||||
@ -185,4 +187,25 @@ public class VehicleInOutController extends JeecgController<VehicleInOut, IVehic
|
|||||||
vehicleInOutService.updateById(vehicleInOut);
|
vehicleInOutService.updateById(vehicleInOut);
|
||||||
return Result.OK("操作成功!");
|
return Result.OK("操作成功!");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 提货
|
||||||
|
* @param vehicleInOut
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@PostMapping(value = "/take")
|
||||||
|
public Result<String> take(@RequestBody VehicleInOut vehicleInOut) {
|
||||||
|
LambdaQueryWrapper<VehicleInOut> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||||
|
lambdaQueryWrapper.eq(VehicleInOut::getVehicleDemandCountId, vehicleInOut.getId());
|
||||||
|
List<VehicleInOut> list = vehicleInOutService.list(lambdaQueryWrapper);
|
||||||
|
if (list != null && list.size() > 0) {
|
||||||
|
return Result.error("已经进行过提货了!");
|
||||||
|
}
|
||||||
|
vehicleInOut.setVehicleDemandCountId(vehicleInOut.getId());
|
||||||
|
vehicleInOut.setId(null)
|
||||||
|
.setCreateTime(null)
|
||||||
|
.setCreateBy(null);
|
||||||
|
vehicleInOutService.save(vehicleInOut);
|
||||||
|
return Result.OK("提货成功!");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -88,6 +88,18 @@ public class VehicleInOut implements Serializable {
|
|||||||
@Excel(name = "司机电话", width = 15)
|
@Excel(name = "司机电话", width = 15)
|
||||||
@ApiModelProperty(value = "司机电话")
|
@ApiModelProperty(value = "司机电话")
|
||||||
private java.lang.String driverTel;
|
private java.lang.String driverTel;
|
||||||
|
/**司机身份证*/
|
||||||
|
@Excel(name = "司机身份证", width = 15)
|
||||||
|
@ApiModelProperty(value = "司机身份证")
|
||||||
|
private java.lang.String driverIdCard;
|
||||||
|
/**进厂门*/
|
||||||
|
@Excel(name = "进厂门", width = 15)
|
||||||
|
@ApiModelProperty(value = "进厂门")
|
||||||
|
private java.lang.String enterFactoryDoor;
|
||||||
|
/**出厂门*/
|
||||||
|
@Excel(name = "出厂门", width = 15)
|
||||||
|
@ApiModelProperty(value = "出厂门")
|
||||||
|
private java.lang.String exitFactoryDoor;
|
||||||
/**当前状态 创建-0,对接人确认-1,预约入厂-2,审核入库-3,审核出厂-4*/
|
/**当前状态 创建-0,对接人确认-1,预约入厂-2,审核入库-3,审核出厂-4*/
|
||||||
@Excel(name = "当前状态", width = 15, dicCode = "currentStatus")
|
@Excel(name = "当前状态", width = 15, dicCode = "currentStatus")
|
||||||
@Dict(dicCode = "currentStatus")
|
@Dict(dicCode = "currentStatus")
|
||||||
@ -127,4 +139,6 @@ public class VehicleInOut implements Serializable {
|
|||||||
@Excel(name = "出厂地磅重量", width = 15)
|
@Excel(name = "出厂地磅重量", width = 15)
|
||||||
@ApiModelProperty(value = "出厂地磅重量")
|
@ApiModelProperty(value = "出厂地磅重量")
|
||||||
private java.lang.Double exitWeight;
|
private java.lang.Double exitWeight;
|
||||||
|
/**用车需求计算id*/
|
||||||
|
private java.lang.String vehicleDemandCountId;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user