11692908/TMS-BOOT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

车辆出入厂审核

Browse Source
This commit is contained in:
王帅 2025-05-08 14:21:47 +08:00
parent b1aba0c921
commit 274e356708
7 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/controller/VehicleInOutController.java
View File

@ -181,6 +181,10 @@ public class VehicleInOutController extends JeecgController<VehicleInOut, IVehic
@PostMapping(value = "/handleConfirm")
public Result<String> handleConfirm(@RequestBody VehicleInOut vehicleInOut) {
VehicleInOut byId = vehicleInOutService.getById(vehicleInOut.getId());
if (Integer.parseInt(vehicleInOut.getCurrentStatus()) <= Integer.parseInt(byId.getCurrentStatus())) {
return Result.error("操作失败，请按照流程操作！");
}
if ("3".equals(vehicleInOut.getCurrentStatus())) {
vehicleInOut.setAtaTime(new Date());
} else if ("4".equals(vehicleInOut.getCurrentStatus())) {
@ -233,4 +237,13 @@ public class VehicleInOutController extends JeecgController<VehicleInOut, IVehic
page.setTotal(vehicleInOuts.size());
return Result.OK(page);
}
@GetMapping(value = "/getCarNum")
public Result<?> getCarNum() {
List<VehicleInOut> vehicleInOuts = vehicleInOutService.getCarNum();
IPage<VehicleInOut> page = new Page<>(1, vehicleInOuts.size());
page.setRecords(vehicleInOuts);
page.setTotal(vehicleInOuts.size());
return Result.OK(page);
}
}

11
jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/entity/VehicleInOut.java
View File

@ -4,10 +4,8 @@ import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
@ -100,7 +98,7 @@ public class VehicleInOut implements Serializable {
@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")
@Dict(dicCode = "currentStatus")
@ApiModelProperty(value = "当前状态")
@ -141,4 +139,7 @@ public class VehicleInOut implements Serializable {
private java.lang.Double exitWeight;
/**用车需求计算id*/
private java.lang.String vehicleDemandCountId;
/** 当前排队数 */
@TableField(exist = false)
private Integer lineUpCount;
}

2
jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/mapper/VehicleInOutMapper.java
View File

@ -18,4 +18,6 @@ public interface VehicleInOutMapper extends BaseMapper<VehicleInOut> {
VehicleInOutCount getCount();
List<VehicleInOut> getVehicle(VehicleParam vehicleParam);
List<VehicleInOut> getCarNum();
}

9
jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/mapper/xml/VehicleInOutMapper.xml
View File

@ -23,4 +23,13 @@
WHERE b.SHIP_DATE >= #{beginDate}
and b.SHIP_DATE &lt;= #{endDate};
</select>
<select id="getCarNum" resultType="org.jeecg.modules.tms.carinout.vehicleinout.entity.VehicleInOut">
SELECT a.*, SUM(CASE WHEN a.CURRENT_STATUS = '2' THEN 1 ELSE 0 END) OVER () AS line_up_count
FROM tms_vehicle_in_out a
LEFT JOIN tms_vehicle_demand b
ON a.VD_NO = b.VD_NO
WHERE b.SHIP_DATE = TRUNC(SYSDATE)
AND a.CURRENT_STATUS != '4';
</select>
</mapper>

2
jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/service/IVehicleInOutService.java
View File

@ -18,4 +18,6 @@ public interface IVehicleInOutService extends IService<VehicleInOut> {
VehicleInOutCount getCount();
List<VehicleInOut> getVehicle(VehicleParam vehicleParam);
List<VehicleInOut> getCarNum();
}

5
jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/carinout/vehicleinout/service/impl/VehicleInOutServiceImpl.java
View File

@ -32,4 +32,9 @@ public class VehicleInOutServiceImpl extends ServiceImpl<VehicleInOutMapper, Veh
public List<VehicleInOut> getVehicle(VehicleParam vehicleParam) {
return vehicleInOutMapper.getVehicle(vehicleParam);
}
@Override
public List<VehicleInOut> getCarNum() {
return vehicleInOutMapper.getCarNum();
}
}

2
jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/deliverydemand/controller/DeliveryDemandController.java
View File

@ -225,7 +225,7 @@ public class DeliveryDemandController extends JeecgController<DeliveryDemand, ID
}
/**
* 更具发货时间获取发货计划
* 根据发货时间获取发货计划
* @param vehicleParam
* @return
*/