|
|
@@ -3440,6 +3440,7 @@ public class KwtWaybillOrderV1Service {
|
|
|
List<Integer> statusList = Arrays.asList(CarWaybillV1Enum.WAIT_UNLOADING.getCode(), CarWaybillV1Enum.COMPLETION_UNLOADING.getCode());
|
|
|
if (statusList.contains( status) && Objects.equals(billOrder.getStatus(), CarWaybillV1Enum.COMPLETION_LOADING.getCode())){
|
|
|
updateOrder.setStatus( status);
|
|
|
+ updateOrder.setRemark(req.getRemark());
|
|
|
updateSubtask.setStatus(status);
|
|
|
updateSubtask.setRemark(req.getRemark());
|
|
|
updateSubtask.setUnloadAmount(org.apache.commons.lang3.StringUtils.isBlank(req.getUnloadAmount()) ? null : new BigDecimal(req.getUnloadAmount()));
|
|
|
@@ -3477,6 +3478,7 @@ public class KwtWaybillOrderV1Service {
|
|
|
if (Objects.equals(billOrder.getStatus(), CarWaybillV1Enum.COMPLETION_UNLOADING.getCode()) && Objects.equals(status,
|
|
|
CarWaybillV1Enum.WAIT_UNLOADING.getCode())){
|
|
|
updateOrder.setStatus(status);
|
|
|
+ updateOrder.setRemark(req.getRemark());
|
|
|
updateSubtask.setStatus(status);
|
|
|
updateSubtask.setRemark(req.getRemark());
|
|
|
updateSubtask.setUnloadAmount(org.apache.commons.lang3.StringUtils.isNotBlank(req.getUnloadAmount()) ? new BigDecimal(req.getUnloadAmount()) : null);
|