|
|
|
@ -122,7 +122,22 @@ public class IoCollectOrderController extends BaseController {
|
|
|
|
|
*
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@GetMapping("/udiwms/basic/collect/order/draft")
|
|
|
|
|
@PostMapping("/udiwms/basic/collect/order/update")
|
|
|
|
|
public BaseResponse updateOrder(@RequestBody CollectOrderRequest collectOrderRequest) {
|
|
|
|
|
IoCollectOrder collectOrder = new IoCollectOrder();
|
|
|
|
|
BeanUtils.copyProperties(collectOrderRequest, collectOrder);
|
|
|
|
|
collectOrder.setUpdateTime(new Date());
|
|
|
|
|
collectOrder.setUpdateUser(getUserId());
|
|
|
|
|
collectOrderService.updateById(collectOrder);
|
|
|
|
|
return ResultVOUtils.success();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 单据挂起
|
|
|
|
|
*
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@PostMapping("/udiwms/basic/collect/order/draft")
|
|
|
|
|
public BaseResponse saveDraftOrder(@RequestBody CollectOrderRequest collectOrderRequest) {
|
|
|
|
|
IoCollectOrder collectOrder = new IoCollectOrder();
|
|
|
|
|
BeanUtils.copyProperties(collectOrderRequest, collectOrder);
|
|
|
|
@ -138,7 +153,7 @@ public class IoCollectOrderController extends BaseController {
|
|
|
|
|
*
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@GetMapping("/udiwms/basic/collect/order/finish")
|
|
|
|
|
@PostMapping("/udiwms/basic/collect/order/finish")
|
|
|
|
|
public BaseResponse saveFinishOrder(@RequestBody CollectOrderRequest collectOrderRequest) {
|
|
|
|
|
|
|
|
|
|
//1.校验是否全部自动赋码
|
|
|
|
@ -161,9 +176,11 @@ public class IoCollectOrderController extends BaseController {
|
|
|
|
|
if (bindWorkRequest.getCollOrder() != null) {
|
|
|
|
|
IoCollectOrder collectOrder = bindWorkRequest.getCollOrder();
|
|
|
|
|
collectOrder.setWorkPlaceCode(bindWorkRequest.getWorkplaceCode());
|
|
|
|
|
collectOrder.setTagStatus(1);
|
|
|
|
|
collectOrderService.updateById(collectOrder);
|
|
|
|
|
} else {
|
|
|
|
|
for (IoCollectOrder collectOrder : bindWorkRequest.getList()) {
|
|
|
|
|
collectOrder.setTagStatus(1);
|
|
|
|
|
collectOrder.setWorkPlaceCode(bindWorkRequest.getWorkplaceCode());
|
|
|
|
|
}
|
|
|
|
|
collectOrderService.updateBatchById(bindWorkRequest.getList());
|
|
|
|
|