|
|
@ -1,6 +1,7 @@
|
|
|
|
package com.glxp.sale.admin.controller.basic;
|
|
|
|
package com.glxp.sale.admin.controller.basic;
|
|
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
|
|
|
|
|
import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
|
|
|
|
import com.glxp.sale.admin.constant.BasicProcessStatus;
|
|
|
|
import com.glxp.sale.admin.constant.BasicProcessStatus;
|
|
|
|
import com.glxp.sale.admin.constant.ConstantStatus;
|
|
|
|
import com.glxp.sale.admin.constant.ConstantStatus;
|
|
|
|
import com.glxp.sale.admin.dao.auth.AuthAdminDao;
|
|
|
|
import com.glxp.sale.admin.dao.auth.AuthAdminDao;
|
|
|
@ -22,6 +23,7 @@ import com.glxp.sale.admin.entity.inventory.InvBusUserEntity;
|
|
|
|
import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity;
|
|
|
|
import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity;
|
|
|
|
import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
|
|
|
|
import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
|
|
|
|
import com.glxp.sale.admin.entity.thrsys.*;
|
|
|
|
import com.glxp.sale.admin.entity.thrsys.*;
|
|
|
|
|
|
|
|
import com.glxp.sale.admin.req.basic.UdiInfoReqeust;
|
|
|
|
import com.glxp.sale.admin.res.basic.SpsSyncBusResponse;
|
|
|
|
import com.glxp.sale.admin.res.basic.SpsSyncBusResponse;
|
|
|
|
import com.glxp.sale.admin.res.basic.SpsSyncDataResponse;
|
|
|
|
import com.glxp.sale.admin.res.basic.SpsSyncDataResponse;
|
|
|
|
import com.glxp.sale.admin.res.basic.SpsSyncOrderResponse;
|
|
|
|
import com.glxp.sale.admin.res.basic.SpsSyncOrderResponse;
|
|
|
@ -32,7 +34,6 @@ import com.glxp.sale.admin.service.inout.OrderService;
|
|
|
|
import com.glxp.sale.admin.service.inventory.InvBusUserService;
|
|
|
|
import com.glxp.sale.admin.service.inventory.InvBusUserService;
|
|
|
|
import com.glxp.sale.admin.service.inventory.InvSubWarehouseService;
|
|
|
|
import com.glxp.sale.admin.service.inventory.InvSubWarehouseService;
|
|
|
|
import com.glxp.sale.admin.service.inventory.InvWarehouseService;
|
|
|
|
import com.glxp.sale.admin.service.inventory.InvWarehouseService;
|
|
|
|
import com.glxp.sale.admin.service.param.SystemParamConfigService;
|
|
|
|
|
|
|
|
import com.glxp.sale.admin.service.thrsys.ThrSubInvWarehouseService;
|
|
|
|
import com.glxp.sale.admin.service.thrsys.ThrSubInvWarehouseService;
|
|
|
|
import com.glxp.sale.admin.thread.BasicBackUpdateProductService;
|
|
|
|
import com.glxp.sale.admin.thread.BasicBackUpdateProductService;
|
|
|
|
import com.glxp.sale.admin.util.BeanUtils;
|
|
|
|
import com.glxp.sale.admin.util.BeanUtils;
|
|
|
@ -48,7 +49,6 @@ import org.springframework.web.bind.annotation.PostMapping;
|
|
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
|
|
|
|
|
|
import com.glxp.sale.admin.req.basic.UdiInfoReqeust;
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.Date;
|
|
|
|
import java.util.Date;
|
|
|
@ -84,7 +84,7 @@ public class SpsSyncUploadController {
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
InvBusUserService invBusUserService;
|
|
|
|
InvBusUserService invBusUserService;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
@PostMapping("sps/sync/basic/upload")
|
|
|
|
@PostMapping("sps/sync/basic/upload")
|
|
|
|
public BaseResponse findProductInfo(@RequestBody SpsSyncDataResponse syncDataResponse) {
|
|
|
|
public BaseResponse findProductInfo(@RequestBody SpsSyncDataResponse syncDataResponse) {
|
|
|
|
if (syncDataResponse != null) {
|
|
|
|
if (syncDataResponse != null) {
|
|
|
@ -93,7 +93,7 @@ public class SpsSyncUploadController {
|
|
|
|
return ResultVOUtils.success("上传成功!");
|
|
|
|
return ResultVOUtils.success("上传成功!");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
@PostMapping("sps/sync/busType/upload")
|
|
|
|
@PostMapping("sps/sync/busType/upload")
|
|
|
|
public BaseResponse findBusType(@RequestBody SpsSyncBusResponse syncDataResponse) {
|
|
|
|
public BaseResponse findBusType(@RequestBody SpsSyncBusResponse syncDataResponse) {
|
|
|
|
if (syncDataResponse != null) {
|
|
|
|
if (syncDataResponse != null) {
|
|
|
@ -102,7 +102,7 @@ public class SpsSyncUploadController {
|
|
|
|
return ResultVOUtils.success("上传成功!");
|
|
|
|
return ResultVOUtils.success("上传成功!");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
@PostMapping("sps/sync/order/upload")
|
|
|
|
@PostMapping("sps/sync/order/upload")
|
|
|
|
public BaseResponse findOrder(@RequestBody SpsSyncOrderResponse syncDataResponse) {
|
|
|
|
public BaseResponse findOrder(@RequestBody SpsSyncOrderResponse syncDataResponse) {
|
|
|
|
if (syncDataResponse != null) {
|
|
|
|
if (syncDataResponse != null) {
|
|
|
@ -111,6 +111,7 @@ public class SpsSyncUploadController {
|
|
|
|
return ResultVOUtils.success("上传成功!");
|
|
|
|
return ResultVOUtils.success("上传成功!");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
@PostMapping("sps/sync/schedule/upload")
|
|
|
|
@PostMapping("sps/sync/schedule/upload")
|
|
|
|
public BaseResponse dealSchedule(@RequestBody BasicExportStatusEntity basicExportStatusEntity) {
|
|
|
|
public BaseResponse dealSchedule(@RequestBody BasicExportStatusEntity basicExportStatusEntity) {
|
|
|
|
//todo
|
|
|
|
//todo
|
|
|
|