|
|
|
@ -9,8 +9,6 @@ import com.glxp.sale.admin.controller.inout.utils.ContrastErpUtil;
|
|
|
|
|
import com.glxp.sale.admin.controller.inout.utils.DataTransUtil;
|
|
|
|
|
import com.glxp.sale.admin.entity.auth.AuthAdmin;
|
|
|
|
|
import com.glxp.sale.admin.entity.basic.BussinessTypeEntity;
|
|
|
|
|
import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
|
|
|
|
|
import com.glxp.sale.admin.entity.info.CompanyEntity;
|
|
|
|
|
import com.glxp.sale.admin.entity.inout.*;
|
|
|
|
|
import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
|
|
|
|
|
import com.glxp.sale.admin.entity.thrsys.ThrOrderDetailEntity;
|
|
|
|
@ -426,8 +424,6 @@ public class OrderDetailController {
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@PostMapping("/warehouse/selectErpOrder")
|
|
|
|
|
public BaseResponse selectErpOrder(@RequestBody ImportErpOrderRequest importErpOrderRequest, BindingResult bindingResult) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (bindingResult.hasErrors()) {
|
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
|
|
|
|
}
|
|
|
|
@ -482,6 +478,9 @@ public class OrderDetailController {
|
|
|
|
|
return ResultVOUtils.error(500, "所选业务单据当前仓库不一致!");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!temp.getInvWarehouseCode().equals(erpOrderEntities.get(i).getInvWarehouseCode())) {
|
|
|
|
|
return ResultVOUtils.error(500, "所选业务单据当前分库不一致!");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!temp.getInvWarehouseCode().equals(erpOrderEntities.get(i).getInvWarehouseCode())) {
|
|
|
|
|
return ResultVOUtils.error(500, "所选业务单据当前分库不一致!");
|
|
|
|
@ -491,7 +490,6 @@ public class OrderDetailController {
|
|
|
|
|
return ResultVOUtils.error(500, "所选单据类型不一致!");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|