|
@@ -803,7 +803,7 @@ public class GatekeeperOrderService {
|
|
|
updateWaybillOrderStatus2(gatekeeper, param, waybillOrder, isEmptyLoadLeave);
|
|
updateWaybillOrderStatus2(gatekeeper, param, waybillOrder, isEmptyLoadLeave);
|
|
|
|
|
|
|
|
//4. 创建门卫卸货订单
|
|
//4. 创建门卫卸货订单
|
|
|
- creatGatekeeperUnLoadingOrder(waybillOrder);
|
|
|
|
|
|
|
+ creatGatekeeperUnLoadingOrder(gatekeeper, waybillOrder);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -926,8 +926,14 @@ public class GatekeeperOrderService {
|
|
|
*
|
|
*
|
|
|
* @param waybillOrder
|
|
* @param waybillOrder
|
|
|
*/
|
|
*/
|
|
|
- private void creatGatekeeperUnLoadingOrder(KwtWaybillOrder waybillOrder) {
|
|
|
|
|
|
|
+ private void creatGatekeeperUnLoadingOrder(KwtGatekeeperWaybillOrder gatekeeperOrder, KwtWaybillOrder waybillOrder) {
|
|
|
log.info("[门卫放行]开始创建卸货门卫订单:{}", JSON.toJSONString(waybillOrder));
|
|
log.info("[门卫放行]开始创建卸货门卫订单:{}", JSON.toJSONString(waybillOrder));
|
|
|
|
|
+ // 原矿卸货放行不需要创建门卫订单
|
|
|
|
|
+ if (Objects.equals(gatekeeperOrder.getType(), GatekeeperTypeEnum.UNLOADING.getCode())) {
|
|
|
|
|
+ log.info("[门卫放行]当前是卸货流程放行,不需要再次创建门卫订单:{}", JSON.toJSONString(gatekeeperOrder));
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
// 只有原矿运输的才会新增卸货门卫订单
|
|
// 只有原矿运输的才会新增卸货门卫订单
|
|
|
KwtLogisticsOrder logisticsOrder = getLogisticsOrder(waybillOrder.getLOrderId());
|
|
KwtLogisticsOrder logisticsOrder = getLogisticsOrder(waybillOrder.getLOrderId());
|
|
|
if (!Objects.equals(1, logisticsOrder.getOrderType())) {
|
|
if (!Objects.equals(1, logisticsOrder.getOrderType())) {
|