|
|
|
@ -12,6 +12,7 @@ import com.logpm.distribution.vo.app.*;
|
|
|
|
|
import io.swagger.annotations.Api; |
|
|
|
|
import io.swagger.annotations.ApiOperation; |
|
|
|
|
import lombok.AllArgsConstructor; |
|
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
|
import org.springblade.core.mp.support.Condition; |
|
|
|
|
import org.springblade.core.mp.support.Query; |
|
|
|
|
import org.springblade.core.tool.api.R; |
|
|
|
@ -28,6 +29,7 @@ import java.util.List;
|
|
|
|
|
*/ |
|
|
|
|
@RestController |
|
|
|
|
@AllArgsConstructor |
|
|
|
|
@Slf4j |
|
|
|
|
@RequestMapping("/app/delivery") |
|
|
|
|
@Api(value = "配送管理", tags = "配送管理App接口") |
|
|
|
|
public class DistributionDeliveryAppController { |
|
|
|
@ -142,7 +144,8 @@ public class DistributionDeliveryAppController {
|
|
|
|
|
msg = distributionDeliveryListService.loadingscan(distrilbutionloadingscanDTO); |
|
|
|
|
|
|
|
|
|
}catch (Exception e){ |
|
|
|
|
e.printStackTrace(); |
|
|
|
|
msg = R.fail(e.getMessage()); |
|
|
|
|
log.error(e.getMessage()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return msg; |
|
|
|
@ -155,7 +158,13 @@ public class DistributionDeliveryAppController {
|
|
|
|
|
@ApiOperationSupport(order = 6) |
|
|
|
|
@ApiOperation(value = "装车扫描", notes = "传入DistrilbutionloadingscanDTO") |
|
|
|
|
public R zeroLoading(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) { |
|
|
|
|
R msg = distributionDeliveryListService.zeroLoading(distrilbutionloadingscanDTO); |
|
|
|
|
R msg = null; |
|
|
|
|
try { |
|
|
|
|
msg = distributionDeliveryListService.zeroLoading(distrilbutionloadingscanDTO); |
|
|
|
|
} catch (Exception e) { |
|
|
|
|
msg = R.fail(e.getMessage()); |
|
|
|
|
log.error(e.getMessage()); |
|
|
|
|
} |
|
|
|
|
return msg; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -200,7 +209,13 @@ public class DistributionDeliveryAppController {
|
|
|
|
|
@ApiOperationSupport(order = 8) |
|
|
|
|
@ApiOperation(value = "装车扫描(取消)", notes = "传入DistrilbutionloadingscanDTO") |
|
|
|
|
public R loadingscanoff(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) { |
|
|
|
|
R msg = distributionDeliveryListService.loadingscanoff(distrilbutionloadingscanDTO); |
|
|
|
|
R msg = null; |
|
|
|
|
try { |
|
|
|
|
msg = distributionDeliveryListService.loadingscanoff(distrilbutionloadingscanDTO); |
|
|
|
|
} catch (Exception e) { |
|
|
|
|
msg = R.fail(e.getMessage()); |
|
|
|
|
log.error(e.getMessage()); |
|
|
|
|
} |
|
|
|
|
return msg; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|