业务单据,扫码单据关联用户,仓库信息等;bug修复

master
anthonyywj2 4 years ago
parent 94b9941e49
commit f921753024

@ -76,6 +76,32 @@ public class BussinessLocalTypeController {
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
} }
@AuthRuleAnnotation("")
@GetMapping("/udiwms/localBusType/filterJoinByUser")
public BaseResponse filterJoinByUser(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
String customerId = getCustomerId();
if (!customerId.equals(Constant.SYSTEM_CUSTOMER_ID)) {
bussinessTypeFilterRequest.setSpUse(true);
}
List<BussinessLocalTypeEntity> bussinessTypeEntities;
bussinessTypeEntities = bussinessLocalTypeService.filterJoinByUser(
bussinessTypeFilterRequest);
PageInfo<BussinessLocalTypeEntity> pageInfo;
pageInfo = new PageInfo<>(bussinessTypeEntities);
PageSimpleResponse<BussinessLocalTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(bussinessTypeEntities);
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("/udiwms/localBusType/filterByBus") @GetMapping("/udiwms/localBusType/filterByBus")
public BaseResponse filterByBus(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest, public BaseResponse filterByBus(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest,

@ -111,6 +111,28 @@ public class BussinessTypeController {
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
} }
@AuthRuleAnnotation("")
@GetMapping("/udiwms/bussinessType/filterAllByUser")
public BaseResponse filterAllByUser(BussinessTypeFilterRequest bussinessTypeFilterRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
String customerId = getCustomerId();
if (!customerId.equals(Constant.SYSTEM_CUSTOMER_ID)) {
bussinessTypeFilterRequest.setSpUse(true);
}
List<BussinessTypeEntity> bussinessTypeEntities;
bussinessTypeEntities = bussinessTypeService.filterAllByUser(bussinessTypeFilterRequest);
PageInfo<BussinessTypeEntity> pageInfo;
pageInfo = new PageInfo<>(bussinessTypeEntities);
PageSimpleResponse<BussinessTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(bussinessTypeEntities);
return ResultVOUtils.success(pageSimpleResponse);
}
@GetMapping("/udiwms/bussinessType/udimsFilter") @GetMapping("/udiwms/bussinessType/udimsFilter")
public BaseResponse udimsFilter(BussinessTypeFilterRequest bussinessTypeFilterRequest, public BaseResponse udimsFilter(BussinessTypeFilterRequest bussinessTypeFilterRequest,

@ -7,12 +7,14 @@ import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
import com.glxp.sale.admin.constant.Constant; import com.glxp.sale.admin.constant.Constant;
import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.constant.ConstantStatus;
import com.glxp.sale.admin.controller.inout.utils.DataTransUtil; 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.BussinessTypeEntity;
import com.glxp.sale.admin.entity.info.CompanyEntity; import com.glxp.sale.admin.entity.info.CompanyEntity;
import com.glxp.sale.admin.entity.inout.*; import com.glxp.sale.admin.entity.inout.*;
import com.glxp.sale.admin.entity.udid.UdiEntity; import com.glxp.sale.admin.entity.udid.UdiEntity;
import com.glxp.sale.admin.req.inout.*; import com.glxp.sale.admin.req.inout.*;
import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.service.auth.CustomerService;
import com.glxp.sale.admin.service.basic.BussinessTypeService; import com.glxp.sale.admin.service.basic.BussinessTypeService;
import com.glxp.sale.admin.service.info.CompanyService; import com.glxp.sale.admin.service.info.CompanyService;
import com.glxp.sale.admin.service.inout.*; import com.glxp.sale.admin.service.inout.*;
@ -62,6 +64,9 @@ public class OrderController {
@Value("${file_path}") @Value("${file_path}")
private String filePath; private String filePath;
@Resource
CustomerService customerService;
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("udiwms/inout/order/getUdi") @GetMapping("udiwms/inout/order/getUdi")
public BaseResponse getUdi(@RequestParam("code") String code) { public BaseResponse getUdi(@RequestParam("code") String code) {
@ -89,9 +94,10 @@ public class OrderController {
// orderFilterRequest.setStatusOrOne(ConstantStatus.ORDER_STATUS_TEMP_SAVE); // orderFilterRequest.setStatusOrOne(ConstantStatus.ORDER_STATUS_TEMP_SAVE);
if (StringUtils.isBlank(orderFilterRequest.getCustomerId())) if (StringUtils.isBlank(orderFilterRequest.getCustomerId()))
return ResultVOUtils.success(); return ResultVOUtils.success();
if (orderFilterRequest.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) if (orderFilterRequest.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) {
orderFilterRequest.setCustomerId(null); orderFilterRequest.setCustomerId(null);
else { orderFilterRequest.setUserId(customerService.getUserId());
} else {
CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(orderFilterRequest.getCustomerId())); CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(orderFilterRequest.getCustomerId()));
if (companyEntity.getUnitIdFk().equals("110")) { if (companyEntity.getUnitIdFk().equals("110")) {
orderFilterRequest.setFromCorpId(null); orderFilterRequest.setFromCorpId(null);
@ -164,10 +170,9 @@ public class OrderController {
BindingResult bindingResult) { BindingResult bindingResult) {
if (StringUtils.isBlank(orderFilterRequest.getCustomerId())) return ResultVOUtils.success(); if (StringUtils.isBlank(orderFilterRequest.getCustomerId())) return ResultVOUtils.success();
if (orderFilterRequest.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) if (orderFilterRequest.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) {
orderFilterRequest.setCustomerId(null); orderFilterRequest.setCustomerId(null);
else { } else {
CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(orderFilterRequest.getCustomerId())); CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(orderFilterRequest.getCustomerId()));
if (companyEntity.getUnitIdFk().equals("110")) { if (companyEntity.getUnitIdFk().equals("110")) {
orderFilterRequest.setFromCorpId(null); orderFilterRequest.setFromCorpId(null);
@ -249,8 +254,10 @@ public class OrderController {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
AuthAdmin authAdmin = customerService.getUserBean();
OrderEntity orderEntity = orderService.findById(updateExportStatusRequest.getOrderId()); OrderEntity orderEntity = orderService.findById(updateExportStatusRequest.getOrderId());
orderEntity.setReceiveStatus(1); orderEntity.setReceiveStatus(1);
orderEntity.setReviewUser(authAdmin.getId().intValue());
orderService.updateOrder(orderEntity); orderService.updateOrder(orderEntity);
List<String> erpIds = DataTransUtil.strToErpList(orderEntity.getErpFk()); List<String> erpIds = DataTransUtil.strToErpList(orderEntity.getErpFk());
if (erpIds != null && erpIds.size() > 0) { if (erpIds != null && erpIds.size() > 0) {
@ -259,6 +266,7 @@ public class OrderController {
stockOrderFilterRequest.setBillNo(id); stockOrderFilterRequest.setBillNo(id);
StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest); StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest);
stockOrderEntity.setStatus(ConstantStatus.SORDER_DELIVER); stockOrderEntity.setStatus(ConstantStatus.SORDER_DELIVER);
stockOrderEntity.setReviewUser(authAdmin.getId().intValue());
stockOrderService.updateById(stockOrderEntity); stockOrderService.updateById(stockOrderEntity);
} }

@ -6,6 +6,7 @@ import com.glxp.sale.admin.constant.ConstantStatus;
import com.glxp.sale.admin.controller.inout.utils.CheckOrderUtils; import com.glxp.sale.admin.controller.inout.utils.CheckOrderUtils;
import com.glxp.sale.admin.controller.inout.utils.ContrastErpUtil; import com.glxp.sale.admin.controller.inout.utils.ContrastErpUtil;
import com.glxp.sale.admin.controller.inout.utils.DataTransUtil; 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.BussinessTypeEntity;
import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.sale.admin.entity.info.CompanyEntity; import com.glxp.sale.admin.entity.info.CompanyEntity;
@ -21,6 +22,7 @@ import com.glxp.sale.admin.req.thrsys.FilterThrOrderRequest;
import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.basic.BussinessOriginTypeResponse; import com.glxp.sale.admin.res.basic.BussinessOriginTypeResponse;
import com.glxp.sale.admin.res.inout.ErpOrderResponse; import com.glxp.sale.admin.res.inout.ErpOrderResponse;
import com.glxp.sale.admin.service.auth.CustomerService;
import com.glxp.sale.admin.service.basic.BussinessOriginTypeService; import com.glxp.sale.admin.service.basic.BussinessOriginTypeService;
import com.glxp.sale.admin.service.basic.BussinessTypeService; import com.glxp.sale.admin.service.basic.BussinessTypeService;
import com.glxp.sale.admin.service.basic.UdiInfoService; import com.glxp.sale.admin.service.basic.UdiInfoService;
@ -99,6 +101,10 @@ public class OrderDetailController {
IoTransInoutService ioTransInoutService; IoTransInoutService ioTransInoutService;
@Resource @Resource
BussinessOriginTypeService bussinessOriginTypeService; BussinessOriginTypeService bussinessOriginTypeService;
@Resource
CustomerService customerService;
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("/spms/erpOrder/filter") @GetMapping("/spms/erpOrder/filter")
public BaseResponse filterSpmsOrder(FilterOrderRequest filterErpOrderRequest, public BaseResponse filterSpmsOrder(FilterOrderRequest filterErpOrderRequest,
@ -202,6 +208,7 @@ public class OrderDetailController {
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
// } // }
} }
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("/udiwms/erpOrder/addStockOrder") @GetMapping("/udiwms/erpOrder/addStockOrder")
public BaseResponse addStockOrder(FilterOrderRequest filterErpOrderRequest, public BaseResponse addStockOrder(FilterOrderRequest filterErpOrderRequest,
@ -335,6 +342,7 @@ public class OrderDetailController {
return ResultVOUtils.error(500, "删除失败"); return ResultVOUtils.error(500, "删除失败");
} }
} }
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping(value = "/warehouse/inout/order/detail")//TODO 订单详情 @GetMapping(value = "/warehouse/inout/order/detail")//TODO 订单详情
public BaseResponse orderDetail(FilterErpOrderRequest filterErpOrderRequest, public BaseResponse orderDetail(FilterErpOrderRequest filterErpOrderRequest,
@ -350,6 +358,7 @@ public class OrderDetailController {
List<ErpOrderEntity> erpOrderEntities = orderDetailService.filterMyErpOrder(filterErpOrderRequest); List<ErpOrderEntity> erpOrderEntities = orderDetailService.filterMyErpOrder(filterErpOrderRequest);
return ResultVOUtils.success(erpOrderEntities); return ResultVOUtils.success(erpOrderEntities);
} }
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping(value = "/warehouse/inout/order/uploadOrder") @GetMapping(value = "/warehouse/inout/order/uploadOrder")
public BaseResponse uploadOrder(FilterErpOrderRequest filterErpOrderRequest, public BaseResponse uploadOrder(FilterErpOrderRequest filterErpOrderRequest,
@ -445,6 +454,8 @@ public class OrderDetailController {
} }
} }
if (erpOrderEntities != null && erpOrderEntities.size() > 0) { if (erpOrderEntities != null && erpOrderEntities.size() > 0) {
AuthAdmin authAdmin = customerService.getUserBean();
ErpOrderEntity temp = erpOrderEntities.get(0); ErpOrderEntity temp = erpOrderEntities.get(0);
for (int i = 0; i < erpOrderEntities.size(); i++) { for (int i = 0; i < erpOrderEntities.size(); i++) {
if (!temp.getCompanyname().equals(erpOrderEntities.get(i).getCompanyname())) { if (!temp.getCompanyname().equals(erpOrderEntities.get(i).getCompanyname())) {
@ -455,6 +466,7 @@ public class OrderDetailController {
OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
orderFilterRequest.setId(importErpOrderRequest.getOrderId()); orderFilterRequest.setId(importErpOrderRequest.getOrderId());
OrderEntity orderEntity = orderService.findOne(orderFilterRequest); OrderEntity orderEntity = orderService.findOne(orderFilterRequest);
orderEntity.setReviewUser(authAdmin.getId().intValue());
ErpOrderEntity exitErp = new ContrastErpUtil().vailErpExit(orderDetailService, erpOrderEntities, importErpOrderRequest.getOrderId()); ErpOrderEntity exitErp = new ContrastErpUtil().vailErpExit(orderDetailService, erpOrderEntities, importErpOrderRequest.getOrderId());
if (exitErp != null) { if (exitErp != null) {
String errMsg = "所选ERP单" + exitErp.getErpOrderId() + "已被其他出入库单" + exitErp.getOrderIdFk() + "绑定"; String errMsg = "所选ERP单" + exitErp.getErpOrderId() + "已被其他出入库单" + exitErp.getOrderIdFk() + "绑定";
@ -469,13 +481,6 @@ public class OrderDetailController {
List<WarehouseEntity> warehouseEntityList = codesService.findByReceiptId(importErpOrderRequest.getOrderId()); List<WarehouseEntity> warehouseEntityList = codesService.findByReceiptId(importErpOrderRequest.getOrderId());
transInoutService.genOrderDetail(warehouseEntityList); transInoutService.genOrderDetail(warehouseEntityList);
checkOrderUtils.check(orderEntity.getId(), erpOrderEntities); checkOrderUtils.check(orderEntity.getId(), erpOrderEntities);
// transInoutService.printOrder(orderEntity.getId());
// List<ErpOrderEntity> returnOrders = new ContrastErpUtil().transErp(erpOrderEntities, udiRelevanceService, importErpOrderRequest.getOrderId());
// orderDetailService.insertErpOrders(returnOrders);
// List<WarehouseEntity> warehouseEntityList = codesService.findByReceiptId(importErpOrderRequest.getOrderId());
// new ContrastErpUtil().contrastErp(udiInfoService, udiRelevanceService, orderDetailService, orderService, warehouseEntityList, systemParamConfigService, bussinessTypeEntity);
} else { } else {
return ResultVOUtils.error(500, "ERP订单不能为空"); return ResultVOUtils.error(500, "ERP订单不能为空");
} }

@ -22,6 +22,7 @@ import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
import com.glxp.sale.admin.res.inout.ErpOrderResponse; import com.glxp.sale.admin.res.inout.ErpOrderResponse;
import com.glxp.sale.admin.res.inout.StockOrderResponse; import com.glxp.sale.admin.res.inout.StockOrderResponse;
import com.glxp.sale.admin.service.auth.AuthAdminService; import com.glxp.sale.admin.service.auth.AuthAdminService;
import com.glxp.sale.admin.service.auth.CustomerService;
import com.glxp.sale.admin.service.basic.BasicUnitMaintainService; import com.glxp.sale.admin.service.basic.BasicUnitMaintainService;
import com.glxp.sale.admin.service.basic.BussinessLocalTypeService; import com.glxp.sale.admin.service.basic.BussinessLocalTypeService;
import com.glxp.sale.admin.service.basic.UdiInfoService; import com.glxp.sale.admin.service.basic.UdiInfoService;
@ -84,6 +85,8 @@ public class StockOrderController {
BasicUnitMaintainService basicUnitMaintainService; BasicUnitMaintainService basicUnitMaintainService;
@Resource @Resource
OrderService orderService; OrderService orderService;
@Resource
CustomerService customerService;
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/error") @GetMapping("/udiwms/stock/order/error")
@ -132,7 +135,7 @@ public class StockOrderController {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
Integer userId = customerService.getUserId();
boolean noRepeatBillNo = false; boolean noRepeatBillNo = false;
boolean newBillNo = false; boolean newBillNo = false;
StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest(); StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
@ -156,7 +159,7 @@ public class StockOrderController {
StockOrderEntity stockOrderEntity = new StockOrderEntity(); StockOrderEntity stockOrderEntity = new StockOrderEntity();
BeanUtils.copyProperties(stockOrderPostRequest, stockOrderEntity); BeanUtils.copyProperties(stockOrderPostRequest, stockOrderEntity);
stockOrderEntity.setCreateUser(userId);
stockOrderEntity.setStatus( stockOrderEntity.setStatus(
StringUtils.isBlank(stockOrderEntity.getStatus()) ? 501 + ""//未提交 StringUtils.isBlank(stockOrderEntity.getStatus()) ? 501 + ""//未提交
: stockOrderEntity.getStatus()); : stockOrderEntity.getStatus());
@ -274,6 +277,7 @@ public class StockOrderController {
CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(stockOrderFilterRequest.getCorpId())); CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(stockOrderFilterRequest.getCorpId()));
if (companyEntity.getUnitIdFk().equals("110")) { if (companyEntity.getUnitIdFk().equals("110")) {
stockOrderFilterRequest.setUnitIdFk(null); stockOrderFilterRequest.setUnitIdFk(null);
stockOrderFilterRequest.setUserId(customerService.getUserId());
} else } else
stockOrderFilterRequest.setUnitIdFk(companyEntity.getUnitIdFk()); stockOrderFilterRequest.setUnitIdFk(companyEntity.getUnitIdFk());
stockOrderFilterRequest.setCorpId(null); stockOrderFilterRequest.setCorpId(null);

@ -19,6 +19,7 @@ import com.glxp.sale.admin.req.inout.*;
import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.inout.WarehouseResponse; import com.glxp.sale.admin.res.inout.WarehouseResponse;
import com.glxp.sale.admin.service.auth.AuthAdminService; import com.glxp.sale.admin.service.auth.AuthAdminService;
import com.glxp.sale.admin.service.auth.CustomerService;
import com.glxp.sale.admin.service.basic.BasicUnitMaintainService; import com.glxp.sale.admin.service.basic.BasicUnitMaintainService;
import com.glxp.sale.admin.service.basic.BussinessTypeService; import com.glxp.sale.admin.service.basic.BussinessTypeService;
import com.glxp.sale.admin.service.info.CompanyService; import com.glxp.sale.admin.service.info.CompanyService;
@ -71,6 +72,8 @@ public class WareHouseController {
private WarehouseUserService warehouseUserService; private WarehouseUserService warehouseUserService;
@Resource @Resource
private WarehouseBussinessTypeService warehouseBussinessTypeService; private WarehouseBussinessTypeService warehouseBussinessTypeService;
@Resource
CustomerService customerService;
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("admin/warehouse/inout/list") @GetMapping("admin/warehouse/inout/list")
@ -287,7 +290,7 @@ public class WareHouseController {
orderSaveRequest.setActDate(addOrderRequest.getActDate()); orderSaveRequest.setActDate(addOrderRequest.getActDate());
} }
Integer userId = customerService.getUserId();
orderSaveRequest.setMainAction(bussinessTypeEntity.getMainAction()); orderSaveRequest.setMainAction(bussinessTypeEntity.getMainAction());
orderSaveRequest.setAction(bussinessTypeEntity.getAction()); orderSaveRequest.setAction(bussinessTypeEntity.getAction());
orderSaveRequest.setActor(addOrderRequest.getActor()); orderSaveRequest.setActor(addOrderRequest.getActor());
@ -302,6 +305,7 @@ public class WareHouseController {
orderSaveRequest.setSignStatus(ConstantStatus.ORDER_SIGN_UN); orderSaveRequest.setSignStatus(ConstantStatus.ORDER_SIGN_UN);
orderSaveRequest.setReceiveStatus(ConstantStatus.RECEIVE_UN); orderSaveRequest.setReceiveStatus(ConstantStatus.RECEIVE_UN);
orderSaveRequest.setCustomerId(addOrderRequest.getCustomerId()); orderSaveRequest.setCustomerId(addOrderRequest.getCustomerId());
orderSaveRequest.setCreateUser(userId);
orderService.insertOrder(orderSaveRequest); orderService.insertOrder(orderSaveRequest);
} }
WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest(); WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest();
@ -356,7 +360,9 @@ public class WareHouseController {
} }
try { try {
String customerId = getCustomerId(); String customerId = getCustomerId();
Integer userId = customerService.getUserId();
postOrderRequest.setCustomerId(customerId); postOrderRequest.setCustomerId(customerId);
postOrderRequest.setUserId(userId);
ioTransInoutService.creatOrderWeb(postOrderRequest); ioTransInoutService.creatOrderWeb(postOrderRequest);
} catch (Exception e) { } catch (Exception e) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK); return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
@ -375,7 +381,9 @@ public class WareHouseController {
} }
try { try {
String customerId = getCustomerId(); String customerId = getCustomerId();
Integer userId = customerService.getUserId();
postOrderRequest.setCustomerId(customerId); postOrderRequest.setCustomerId(customerId);
postOrderRequest.setUserId(userId);
ioTransInoutService.creatOrder(postOrderRequest); ioTransInoutService.creatOrder(postOrderRequest);
} catch (Exception e) { } catch (Exception e) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK); return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
@ -392,8 +400,10 @@ public class WareHouseController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
try { try {
String customerId = getCustomerIdBykey(); AuthAdmin authAdmin = customerService.getUserBeanByKey();
postOrderRequest.setCustomerId(customerId);
postOrderRequest.setCustomerId(authAdmin.getCustomerId() + "");
postOrderRequest.setUserId(authAdmin.getId().intValue());
ioTransInoutService.createOrderUdims(postOrderRequest); ioTransInoutService.createOrderUdims(postOrderRequest);
} catch (Exception e) { } catch (Exception e) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK); return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
@ -461,6 +471,7 @@ public class WareHouseController {
/** /**
* *
*
* @param code * @param code
* @return * @return
*/ */

@ -139,6 +139,7 @@ public class CheckOrderUtils {
status = getStockOrderStatus(orderEntity, bussinessTypeEntity); status = getStockOrderStatus(orderEntity, bussinessTypeEntity);
stockOrderEntity.setStatus(status); stockOrderEntity.setStatus(status);
stockOrderEntity.setOrderIdFk(orderId); stockOrderEntity.setOrderIdFk(orderId);
stockOrderEntity.setReviewUser(orderEntity.getReviewUser());
stockOrderService.updateById(stockOrderEntity); stockOrderService.updateById(stockOrderEntity);
} }
} }

@ -8,6 +8,7 @@ import com.glxp.sale.admin.req.info.DeleteRequest;
import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest; import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest;
import com.glxp.sale.admin.res.inventory.InvWarehouseExportResponse; import com.glxp.sale.admin.res.inventory.InvWarehouseExportResponse;
import com.glxp.sale.admin.res.inventory.InvWarehouseResponse; import com.glxp.sale.admin.res.inventory.InvWarehouseResponse;
import com.glxp.sale.admin.service.auth.CustomerService;
import com.glxp.sale.admin.service.inventory.InvWarehouseService; import com.glxp.sale.admin.service.inventory.InvWarehouseService;
import com.glxp.sale.admin.util.DateUtil; import com.glxp.sale.admin.util.DateUtil;
import com.glxp.sale.admin.util.FileUtils; import com.glxp.sale.admin.util.FileUtils;
@ -35,9 +36,12 @@ public class InvWarehouseController {
@Resource @Resource
InvWarehouseService invWarehouseService; InvWarehouseService invWarehouseService;
@Resource
CustomerService customerService;
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("spms/inv/warehouse/filter") @GetMapping("spms/inv/warehouse/filter")
public BaseResponse filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) { public BaseResponse filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) {
List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest); List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest);
List<InvWarehouseResponse> merge = merge(invWarehouseEntities, 0); List<InvWarehouseResponse> merge = merge(invWarehouseEntities, 0);
@ -55,6 +59,17 @@ public class InvWarehouseController {
return ResultVOUtils.success(invWarehouseEntities); return ResultVOUtils.success(invWarehouseEntities);
} }
@AuthRuleAnnotation("")
@GetMapping("spms/inv/warehouse/filterAllByUser")
public BaseResponse filterAllByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) {
Integer userId = customerService.getUserId();
filterInvWarehouseRequest.setUserId(userId);
filterInvWarehouseRequest.setPid(0);
List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterAllByUser(filterInvWarehouseRequest);
return ResultVOUtils.success(invWarehouseEntities);
}
public List<InvWarehouseResponse> merge(List<InvWarehouseEntity> invWarehouseEntities, public List<InvWarehouseResponse> merge(List<InvWarehouseEntity> invWarehouseEntities,
Integer pid) { Integer pid) {
List<InvWarehouseResponse> invWarehouseResponses = new ArrayList<>(); List<InvWarehouseResponse> invWarehouseResponses = new ArrayList<>();

@ -14,6 +14,8 @@ public interface BussinessLocalTypeDao {
List<BussinessLocalTypeEntity> filterJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest); List<BussinessLocalTypeEntity> filterJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest);
List<BussinessLocalTypeEntity> filterJoinByUser(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest);
List<BussinessLocalTypeEntity> filterLeftJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest); List<BussinessLocalTypeEntity> filterLeftJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest);
BussinessLocalTypeEntity findBTByAction(String action); BussinessLocalTypeEntity findBTByAction(String action);

@ -16,6 +16,8 @@ public interface BussinessTypeDao {
List<BussinessTypResponse> filterJoinList(BussinessTypeFilterRequest bussinessTypeFilterRequest); List<BussinessTypResponse> filterJoinList(BussinessTypeFilterRequest bussinessTypeFilterRequest);
List<BussinessTypeEntity> filterAllByUser(BussinessTypeFilterRequest bussinessTypeFilterRequest);
boolean insertBussinessType(BussinessTypeEntity bussinessTypeEntity); boolean insertBussinessType(BussinessTypeEntity bussinessTypeEntity);
boolean insertIgnoreBussinessType(BussinessTypeEntity bussinessTypeEntity); boolean insertIgnoreBussinessType(BussinessTypeEntity bussinessTypeEntity);

@ -10,6 +10,8 @@ public interface InvWarehouseDao {
List<InvWarehouseEntity> filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest); List<InvWarehouseEntity> filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest);
List<InvWarehouseEntity> filterAllByUser(FilterInvWarehouseRequest filterInvWarehouseRequest);
InvWarehouseEntity selectMaxCode(FilterInvWarehouseRequest filterInvWarehouseRequest); InvWarehouseEntity selectMaxCode(FilterInvWarehouseRequest filterInvWarehouseRequest);
List<InvWarehouseEntity> filterGroupInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest); List<InvWarehouseEntity> filterGroupInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest);

@ -29,4 +29,6 @@ public class OrderFilterRequest extends ListPageRequest {
private Integer createUser; private Integer createUser;
private Integer reviewUser; private Integer reviewUser;
private Integer userId;
} }

@ -11,6 +11,7 @@ public class PostOrderRequest {
int submitType;//0提交1保存 int submitType;//0提交1保存
String oldOrderId;//保存再编辑后再保存或提交根据旧id删除旧数据。 String oldOrderId;//保存再编辑后再保存或提交根据旧id删除旧数据。
private String customerId; private String customerId;
private Integer userId;
public List<PostOrder> getPostOrder() { public List<PostOrder> getPostOrder() {
return postOrders; return postOrders;

@ -11,6 +11,7 @@ public class PostUdimsOrderRequest {
List<OrderBean> orderBeans; List<OrderBean> orderBeans;
private String customerId; private String customerId;
private Integer userId;
@Data @Data
public static class OrderBean { public static class OrderBean {
@ -56,5 +57,4 @@ public class PostUdimsOrderRequest {
} }
} }

@ -32,4 +32,6 @@ public class StockOrderFilterRequest extends ListPageRequest {
private String locStorageCode; private String locStorageCode;
private Integer createUser; private Integer createUser;
private Integer reviewUser; private Integer reviewUser;
private Integer userId;
} }

@ -15,7 +15,7 @@ public class FilterInvWarehouseRequest extends ListPageRequest {
private Boolean advanceType; private Boolean advanceType;
private Boolean isDefault; private Boolean isDefault;
private Date updateTime; private Date updateTime;
private Integer level; private Integer level;
private String pcode; private String pcode;
private Integer userId;
} }

@ -0,0 +1,67 @@
package com.glxp.sale.admin.service.auth;
import com.glxp.sale.admin.dao.auth.AuthLicenseDao;
import com.glxp.sale.admin.entity.auth.AuthAdmin;
import com.glxp.sale.admin.entity.auth.AuthLicense;
import com.glxp.sale.admin.exception.JsonException;
import com.glxp.sale.common.enums.ResultEnum;
import org.springframework.stereotype.Service;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@Service
public class CustomerService {
@Resource
private AuthAdminService authAdminService;
@Resource
private AuthLicenseDao authLicenseDao;
public AuthAdmin getUserBean() {
Integer userId = getUserId();
AuthAdmin authAdmin = authAdminService.findById(userId.longValue());
return authAdmin;
}
public Integer getUserId() {
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if (attributes == null) {
throw new JsonException(ResultEnum.NOT_NETWORK);
}
HttpServletRequest request = attributes.getRequest();
String userId = request.getHeader("ADMIN_ID");
return Integer.parseInt(userId);
}
public long getCustomerId() {
AuthAdmin authAdmin = getUserBean();
return authAdmin.getCustomerId();
}
public long getCustomerIdByKey() {
AuthAdmin authAdmin = getUserBeanByKey();
return authAdmin.getCustomerId();
}
public Integer getUserIdByKey() {
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if (attributes == null) {
throw new JsonException(ResultEnum.NOT_NETWORK);
}
HttpServletRequest request = attributes.getRequest();
String userId = request.getHeader("api_key");
return Integer.parseInt(userId);
}
public AuthAdmin getUserBeanByKey() {
Integer userId = getUserIdByKey();
AuthAdmin authAdmin = authAdminService.findById(userId.longValue());
return authAdmin;
}
}

@ -13,6 +13,8 @@ public interface BussinessLocalTypeService {
List<BussinessLocalTypeEntity> filterJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest); List<BussinessLocalTypeEntity> filterJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest);
List<BussinessLocalTypeEntity> filterJoinByUser(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest);
List<BussinessLocalTypeEntity> filterLeftJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest); List<BussinessLocalTypeEntity> filterLeftJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest);
BussinessLocalTypeEntity findBTByAction(String action); BussinessLocalTypeEntity findBTByAction(String action);

@ -13,6 +13,8 @@ public interface BussinessTypeService {
List<BussinessTypResponse> filterJoinList(BussinessTypeFilterRequest bussinessTypeFilterRequest); List<BussinessTypResponse> filterJoinList(BussinessTypeFilterRequest bussinessTypeFilterRequest);
List<BussinessTypeEntity> filterAllByUser(BussinessTypeFilterRequest bussinessTypeFilterRequest);
BussinessTypeEntity selectById(String id); BussinessTypeEntity selectById(String id);
BussinessTypeEntity findBTByAction(String action); BussinessTypeEntity findBTByAction(String action);

@ -43,6 +43,19 @@ public class BussinessLocalTypeServiceImpl implements BussinessLocalTypeService
return data; return data;
} }
@Override
public List<BussinessLocalTypeEntity> filterJoinByUser(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest) {
if (bussinessTypeFilterRequest == null) {
return Collections.emptyList();
}
if (bussinessTypeFilterRequest.getPage() != null) {
int offset = (bussinessTypeFilterRequest.getPage() - 1) * bussinessTypeFilterRequest.getLimit();
PageHelper.offsetPage(offset, bussinessTypeFilterRequest.getLimit());
}
List<BussinessLocalTypeEntity> data = bussinessLocalTypeDao.filterJoinByUser(bussinessTypeFilterRequest);
return data;
}
@Override @Override
public List<BussinessLocalTypeEntity> filterLeftJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest) { public List<BussinessLocalTypeEntity> filterLeftJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest) {
if (bussinessTypeFilterRequest == null) { if (bussinessTypeFilterRequest == null) {

@ -50,6 +50,19 @@ public class BussinessTypeServiceImpl implements BussinessTypeService {
return data; return data;
} }
@Override
public List<BussinessTypeEntity> filterAllByUser(BussinessTypeFilterRequest bussinessTypeFilterRequest) {
if (bussinessTypeFilterRequest == null) {
return Collections.emptyList();
}
if (bussinessTypeFilterRequest.getPage() != null) {
int offset = (bussinessTypeFilterRequest.getPage() - 1) * bussinessTypeFilterRequest.getLimit();
PageHelper.offsetPage(offset, bussinessTypeFilterRequest.getLimit());
}
List<BussinessTypeEntity> data = bussinessTypeDao.filterAllByUser(bussinessTypeFilterRequest);
return data;
}
@Override @Override
public BussinessTypeEntity selectById(String id) { public BussinessTypeEntity selectById(String id) {
return bussinessTypeDao.selectById( return bussinessTypeDao.selectById(

@ -14,6 +14,8 @@ public interface InvWarehouseService {
List<InvWarehouseEntity> filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest); List<InvWarehouseEntity> filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest);
List<InvWarehouseEntity> filterAllByUser(FilterInvWarehouseRequest filterInvWarehouseRequest);
List<InvWarehouseEntity> filterGroupInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest); List<InvWarehouseEntity> filterGroupInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest);
boolean insertInvWarehouse(InvWarehouseEntity invWarehouseEntity); boolean insertInvWarehouse(InvWarehouseEntity invWarehouseEntity);

@ -49,6 +49,19 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
return data; return data;
} }
@Override
public List<InvWarehouseEntity> filterAllByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) {
if (filterInvWarehouseRequest == null) {
return Collections.emptyList();
}
if (filterInvWarehouseRequest.getPage() != null) {
int offset = (filterInvWarehouseRequest.getPage() - 1) * filterInvWarehouseRequest.getLimit();
PageHelper.offsetPage(offset, filterInvWarehouseRequest.getLimit());
}
List<InvWarehouseEntity> data = invWarehouseDao.filterAllByUser(filterInvWarehouseRequest);
return data;
}
@Override @Override
public List<InvWarehouseEntity> filterGroupInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) { public List<InvWarehouseEntity> filterGroupInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) {
if (filterInvWarehouseRequest == null) { if (filterInvWarehouseRequest == null) {

@ -126,6 +126,7 @@ public class IoTransInoutService {
orderSaveRequest.setCorpOrderId(warehouseEntity.getCorpOrderId()); orderSaveRequest.setCorpOrderId(warehouseEntity.getCorpOrderId());
orderSaveRequest.setFromCorpId(warehouseEntity.getFromCorpId()); orderSaveRequest.setFromCorpId(warehouseEntity.getFromCorpId());
orderSaveRequest.setReceiveStatus(0); orderSaveRequest.setReceiveStatus(0);
orderSaveRequest.setCreateUser(postOrderRequest.getUserId());
orderSaveRequest.setLocStorageCode(warehouseEntity.getLocStorageCode()); orderSaveRequest.setLocStorageCode(warehouseEntity.getLocStorageCode());
orderSaveRequest.setMainAction(warehouseEntity.getMainAction()); orderSaveRequest.setMainAction(warehouseEntity.getMainAction());
orderSaveRequest.setFromCorp(warehouseEntity.getFromCorp()); orderSaveRequest.setFromCorp(warehouseEntity.getFromCorp());
@ -189,6 +190,7 @@ public class IoTransInoutService {
orderSaveRequest.setLocStorageCode(warehouseEntity.getLocStorageCode()); orderSaveRequest.setLocStorageCode(warehouseEntity.getLocStorageCode());
orderSaveRequest.setMainAction(warehouseEntity.getMainAction()); orderSaveRequest.setMainAction(warehouseEntity.getMainAction());
orderSaveRequest.setReceiveStatus(0); orderSaveRequest.setReceiveStatus(0);
orderSaveRequest.setCreateUser(postOrderRequest.getUserId());
orderSaveRequest.setFromCorp(warehouseEntity.getFromCorp()); orderSaveRequest.setFromCorp(warehouseEntity.getFromCorp());
if (postOrder.getErpOrders() != null && postOrder.getErpOrders().size() > 0) if (postOrder.getErpOrders() != null && postOrder.getErpOrders().size() > 0)
orderSaveRequest.setFromType(ConstantStatus.FROM_PDAED); orderSaveRequest.setFromType(ConstantStatus.FROM_PDAED);
@ -237,6 +239,7 @@ public class IoTransInoutService {
orderEntity.setFromType(ConstantStatus.FROM_UDIMS); orderEntity.setFromType(ConstantStatus.FROM_UDIMS);
orderEntity.setReceiveStatus(0); orderEntity.setReceiveStatus(0);
orderEntity.setId(orderId); orderEntity.setId(orderId);
orderEntity.setCreateUser(postUdimsOrderRequest.getUserId());
orderEntity.setMainAction(ConstantType.TYPE_PUT); orderEntity.setMainAction(ConstantType.TYPE_PUT);
orderEntity.setActDate(DateUtil.getDate()); orderEntity.setActDate(DateUtil.getDate());
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
@ -859,6 +862,8 @@ public class IoTransInoutService {
stockOrderEntity.setCustomerId(orderEntity.getCustomerId()); stockOrderEntity.setCustomerId(orderEntity.getCustomerId());
stockOrderEntity.setUnitIdFk(orderEntity.getFromCorpId()); stockOrderEntity.setUnitIdFk(orderEntity.getFromCorpId());
stockOrderEntity.setSourceType(ConstantStatus.ST_SCAN_ADD); stockOrderEntity.setSourceType(ConstantStatus.ST_SCAN_ADD);
stockOrderEntity.setCreateUser(orderEntity.getCreateUser());
stockOrderEntity.setReviewUser(orderEntity.getReviewUser());
stockOrderEntity.setLocStorageCode(orderEntity.getLocStorageCode()); stockOrderEntity.setLocStorageCode(orderEntity.getLocStorageCode());
stockOrderEntity.setCorpId(orderEntity.getFromCorpId()); stockOrderEntity.setCorpId(orderEntity.getFromCorpId());
if (bussinessTypeEntity.isSecCheckEnable()) { if (bussinessTypeEntity.isSecCheckEnable()) {

@ -32,12 +32,42 @@
SELECT basic_bustype_local.id,basic_bustype_local.name localName, basic_bustype_local.action SELECT basic_bustype_local.id,basic_bustype_local.name localName, basic_bustype_local.action
localAction,originAction, localAction,originAction,
basic_bussiness_type.name , basic_bussiness_type.name ,
basic_bussiness_type.action,basic_bussiness_type.checkEnable,basic_bustype_local.advanceType,basic_bustype_local.changeEnable basic_bussiness_type.action,basic_bussiness_type.checkEnable,basic_bustype_local.advanceType,basic_bustype_local.changeEnable,
,
basic_bustype_local.spUse,basic_bussiness_type.storageCode,basic_bussiness_type.corpType,basic_bussiness_type.mainAction basic_bustype_local.spUse,basic_bussiness_type.storageCode,basic_bussiness_type.corpType,basic_bussiness_type.mainAction
FROM basic_bustype_local inner join FROM basic_bustype_local
basic_bussiness_type inner join basic_bussiness_type on basic_bustype_local.action = basic_bussiness_type.localAction
on basic_bustype_local.action = basic_bussiness_type.localAction <where>
<if test="name != ''and name != null">
AND basic_bustype_local.name LIKE concat(#{name},'%')
</if>
<if test="action != ''and action != null">
AND basic_bustype_local.action LIKE concat(#{action},'%')
</if>
<if test="enabled != ''and enabled != null">
AND basic_bustype_local.enable =#{enabled}
</if>
<if test="enabled != ''and enabled != null">
AND basic_bussiness_type.enable =#{enabled}
</if>
<if test="spUse != ''and spUse != null">
AND spUse =#{spUse}
</if>
</where>
</select>
<select id="filterJoinByUser" parameterType="com.glxp.sale.admin.req.basic.BussinessLocalTypeFilterRequest"
resultType="com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity">
SELECT basic_bustype_local.id,basic_bustype_local.name localName, basic_bustype_local.action
localAction,originAction,
basic_bussiness_type.name ,
basic_bussiness_type.action,basic_bussiness_type.checkEnable,basic_bustype_local.advanceType,basic_bustype_local.changeEnable,
basic_bustype_local.spUse,basic_bussiness_type.storageCode,basic_bussiness_type.corpType,basic_bussiness_type.mainAction
FROM basic_bustype_local
inner join basic_bussiness_type on basic_bustype_local.action = basic_bussiness_type.localAction
INNER JOIN inv_warehouse_bussiness_type on basic_bussiness_type.action = inv_warehouse_bussiness_type.action
INNER JOIN inv_warehouse on inv_warehouse_bussiness_type.`code` = inv_warehouse.`code`
INNER JOIN inv_warehouse_user on inv_warehouse.`code` =inv_warehouse_user.`code`
<where> <where>
<if test="name != ''and name != null"> <if test="name != ''and name != null">
AND basic_bustype_local.name LIKE concat(#{name},'%') AND basic_bustype_local.name LIKE concat(#{name},'%')

@ -78,7 +78,46 @@
</where> </where>
order by basic_bussiness_type.`index` order by basic_bussiness_type.`index`
</select> </select>
<select id="filterAllByUser" parameterType="com.glxp.sale.admin.req.basic.BussinessTypeFilterRequest"
resultType="com.glxp.sale.admin.entity.basic.BussinessTypeEntity">
SELECT
basic_bussiness_type.id,basic_bussiness_type.action,basic_bussiness_type.name,
basic_bussiness_type.enable,basic_bussiness_type.remark,basic_bussiness_type.mainAction,
basic_bussiness_type.thirdSysFk,basic_bussiness_type.localAction,basic_bussiness_type.secCheckEnable,
basic_bussiness_type.checkUdims,basic_bussiness_type.checkPdaEd,basic_bussiness_type.checkPdaUn,basic_bussiness_type.checkPc,
basic_bussiness_type.checkWebNew,basic_bussiness_type.checkChange,
basic_bussiness_type.secCheckUdims, basic_bussiness_type.secCheckPdaEd, basic_bussiness_type.secCheckPdaUn,
basic_bussiness_type.secCheckWebNew, basic_bussiness_type.secCheckChange,
basic_bustype_local.name localName,basic_bussiness_type.checkEnable, basic_bustype_local.advanceType,
basic_bustype_local.changeEnable,basic_bussiness_type.genUnit,basic_bussiness_type.innerOrder,
basic_bustype_local.spUse,corpType,basic_bussiness_type.storageCode
FROM basic_bussiness_type LEFT JOIN basic_bustype_local
on basic_bussiness_type.localAction = basic_bustype_local.action
INNER JOIN inv_warehouse_bussiness_type on basic_bussiness_type.action = inv_warehouse_bussiness_type.action
INNER JOIN inv_warehouse on inv_warehouse_bussiness_type.`code` = inv_warehouse.`code`
INNER JOIN inv_warehouse_user on inv_warehouse.`code` =inv_warehouse_user.`code`
<where>
<if test="name != ''and name != null">
AND basic_bussiness_type.name LIKE concat(#{name},'%')
</if>
<if test="action != ''and action != null">
AND basic_bussiness_type.action LIKE concat(#{action},'%')
</if>
<if test="mainAction != ''and mainAction != null">
AND basic_bussiness_type.mainAction LIKE concat(#{mainAction},'%')
</if>
<if test="enabled != ''and enabled != null">
AND basic_bussiness_type.enable =#{enabled}
</if>
<if test="advanceType != ''and advanceType != null">
AND basic_bustype_local.advanceType =#{advanceType}
</if>
<if test="spUse != ''and spUse != null">
AND basic_bustype_local.spUse =#{spUse}
</if>
</where>
</select>
<insert id="insertBussinessType" keyProperty="id" <insert id="insertBussinessType" keyProperty="id"
parameterType="com.glxp.sale.admin.entity.basic.BussinessTypeEntity"> parameterType="com.glxp.sale.admin.entity.basic.BussinessTypeEntity">
replace replace

@ -96,10 +96,13 @@
ON basic_products.uuid = basic_udirel.uuid ON basic_products.uuid = basic_udirel.uuid
<where> <where>
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null"> <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc},'%') AND ylqxzcrbarmc LIKE concat('%',#{ylqxzcrbarmc},'%')
</if> </if>
<if test="cpmctymc != '' and cpmctymc != null"> <if test="cpmctymc != '' and cpmctymc != null">
AND cpmctymc LIKE concat(#{cpmctymc},'%') AND cpmctymc LIKE concat('%',#{cpmctymc},'%')
</if>
<if test="ggxh != '' and ggxh != null">
AND ggxh LIKE concat('%',#{ggxh},'%')
</if> </if>
<if test="nameCode != '' and nameCode != null"> <if test="nameCode != '' and nameCode != null">
AND nameCode LIKE concat(#{nameCode},'%') AND nameCode LIKE concat(#{nameCode},'%')

@ -140,7 +140,8 @@
</update> </update>
<select id="filterListOr" parameterType="com.glxp.sale.admin.req.inout.OrderFilterRequest" <select id="filterListOr" parameterType="com.glxp.sale.admin.req.inout.OrderFilterRequest"
resultType="com.glxp.sale.admin.entity.inout.OrderEntity"> resultType="com.glxp.sale.admin.entity.inout.OrderEntity">
SELECT * FROM io_order SELECT io_order.* FROM io_order
INNER JOIN inv_warehouse_user on io_order.locStorageCode = inv_warehouse_user.`code`
<where> <where>
<if test="id != '' and id!=null"> <if test="id != '' and id!=null">
and id =#{id} and id =#{id}
@ -202,7 +203,9 @@
<if test="ullageSupNo != '' and ullageSupNo!=null"> <if test="ullageSupNo != '' and ullageSupNo!=null">
and ullageSupNo =#{ullageSupNo} and ullageSupNo =#{ullageSupNo}
</if> </if>
<if test="userId!=null">
and inv_warehouse_user.userId =#{userId}
</if>
</where> </where>
ORDER BY actDate DESC ORDER BY actDate DESC
@ -210,7 +213,8 @@
<select id="filterList" parameterType="com.glxp.sale.admin.req.inout.OrderFilterRequest" <select id="filterList" parameterType="com.glxp.sale.admin.req.inout.OrderFilterRequest"
resultType="com.glxp.sale.admin.entity.inout.OrderEntity"> resultType="com.glxp.sale.admin.entity.inout.OrderEntity">
SELECT * FROM io_order SELECT io_order.* FROM io_order
INNER JOIN inv_warehouse_user on io_order.locStorageCode = inv_warehouse_user.`code`
<where> <where>
<if test="id != '' and id!=null"> <if test="id != '' and id!=null">
and id =#{id} and id =#{id}
@ -266,15 +270,84 @@
<if test="ullageSupNo != '' and ullageSupNo!=null"> <if test="ullageSupNo != '' and ullageSupNo!=null">
and ullageSupNo =#{ullageSupNo} and ullageSupNo =#{ullageSupNo}
</if> </if>
<if test="userId!=null">
and inv_warehouse_user.userId =#{userId}
</if>
</where> </where>
ORDER BY actDate DESC ORDER BY actDate DESC
</select>
<select id="filterListByUser" parameterType="com.glxp.sale.admin.req.inout.OrderFilterRequest"
resultType="com.glxp.sale.admin.entity.inout.OrderEntity">
SELECT io_order.* FROM io_order
INNER JOIN inv_warehouse_user on io_order.locStorageCode = inv_warehouse_user.`code`
<where>
<if test="id != '' and id!=null">
and id =#{id}
</if>
<if test="mainAction != '' and mainAction!=null">
and mainAction =#{mainAction}
</if>
<if test="fromCorpId != '' and fromCorpId!=null">
and fromCorpId =#{fromCorpId}
</if>
<if test="action != '' and action!=null">
and action = #{action}
</if>
<if test="action==null or action == ''">
and `action` <![CDATA[ <> ]]> 'StockCheck'
</if>
<if test="status != '' and status!=null and status!=10">
and status = #{status}
</if>
<if test="status ==10">
and ( status = 1 or status=-1)
</if>
<if test="exportStatus != '' and exportStatus!=null">
and exportStatus = #{exportStatus}
</if>
<if test="signStatus != '' and signStatus!=null">
and signStatus = #{signStatus}
</if>
<if test="contrastStatus != '' and contrastStatus!=null">
and contrastStatus = #{contrastStatus}
</if>
<if test="stockCheckFk != '' and stockCheckFk!=null">
and stockCheckFk = #{stockCheckFk}
</if>
<if test="receiveStatus != '' and receiveStatus!=null">
and receiveStatus = #{receiveStatus}
</if>
<if test="startTime!=null and startTime!=''">
<![CDATA[ and DATE_FORMAT(actDate, '%Y-%m-%d')>= DATE_FORMAT(#{startTime}, '%Y-%m-%d') ]]>
</if>
<if test="endTime!=null and endTime!=''">
<![CDATA[ and DATE_FORMAT(actDate, '%Y-%m-%d') <= DATE_FORMAT(#{endTime}, '%Y-%m-%d') ]]>
</if>
<if test="customerId != '' and customerId!=null">
and customerId =#{customerId}
</if>
<if test=" createUser!=null">
and createUser =#{createUser}
</if>
<if test=" reviewUser!=null">
and reviewUser =#{reviewUser}
</if>
<if test="ullageSupNo != '' and ullageSupNo!=null">
and ullageSupNo =#{ullageSupNo}
</if>
<if test="userId!=null">
and inv_warehouse_user.userId =#{userId}
</if>
</where>
ORDER BY actDate DESC
</select> </select>
<select id="filterNoSort" parameterType="com.glxp.sale.admin.req.inout.OrderFilterRequest" <select id="filterNoSort" parameterType="com.glxp.sale.admin.req.inout.OrderFilterRequest"
resultType="com.glxp.sale.admin.entity.inout.OrderEntity"> resultType="com.glxp.sale.admin.entity.inout.OrderEntity">
SELECT * FROM io_order SELECT * FROM io_order
INNER JOIN inv_warehouse_user on io_order.locStorageCode = inv_warehouse_user.`code`
<where> <where>
<if test="id != '' and id!=null"> <if test="id != '' and id!=null">
and id =#{id} and id =#{id}
@ -324,6 +397,9 @@
<if test="ullageSupNo != '' and ullageSupNo!=null"> <if test="ullageSupNo != '' and ullageSupNo!=null">
and ullageSupNo =#{ullageSupNo} and ullageSupNo =#{ullageSupNo}
</if> </if>
<if test="userId!=null">
and inv_warehouse_user.userId =#{userId}
</if>
</where> </where>
</select> </select>

@ -7,6 +7,7 @@
resultType="com.glxp.sale.admin.entity.inout.StockOrderEntity"> resultType="com.glxp.sale.admin.entity.inout.StockOrderEntity">
SELECT * SELECT *
FROM stock_order FROM stock_order
INNER JOIN inv_warehouse_user on stock_order.locStorageCode = inv_warehouse_user.`code`
where status = 'success' where status = 'success'
</select> </select>
@ -15,6 +16,7 @@
select * select *
from stock_order from stock_order
INNER JOIN inv_warehouse_user on stock_order.locStorageCode = inv_warehouse_user.`code`
where `status` = '101' where `status` = '101'
ORDER BY id DESC ORDER BY id DESC
@ -93,7 +95,8 @@
</update> </update>
<select id="filterListOr" parameterType="com.glxp.sale.admin.req.inout.StockOrderFilterRequest" <select id="filterListOr" parameterType="com.glxp.sale.admin.req.inout.StockOrderFilterRequest"
resultType="com.glxp.sale.admin.entity.inout.StockOrderEntity"> resultType="com.glxp.sale.admin.entity.inout.StockOrderEntity">
SELECT * FROM stock_order SELECT stock_order.* FROM stock_order
INNER JOIN inv_warehouse_user on stock_order.locStorageCode = inv_warehouse_user.`code`
<where> <where>
<if test="id != '' and id!=null"> <if test="id != '' and id!=null">
and id =#{id} and id =#{id}
@ -164,7 +167,9 @@
<if test="endTime!=null and endTime!=''"> <if test="endTime!=null and endTime!=''">
<![CDATA[ and DATE_FORMAT(billdate, '%Y-%m-%d') <= DATE_FORMAT(#{endTime}, '%Y-%m-%d') ]]> <![CDATA[ and DATE_FORMAT(billdate, '%Y-%m-%d') <= DATE_FORMAT(#{endTime}, '%Y-%m-%d') ]]>
</if> </if>
<if test="userId!=null">
and inv_warehouse_user.userId =#{userId}
</if>
</where> </where>
ORDER BY id DESC ORDER BY id DESC

@ -116,7 +116,7 @@
<if test="count != null">count=#{count},</if> <if test="count != null">count=#{count},</if>
<if test="reCount != null">reCount=#{reCount},</if> <if test="reCount != null">reCount=#{reCount},</if>
<if test="price != null">price=#{price},</if> <if test="price != null">price=#{price},</if>
<if test="secSalesListNo != null != null">secSalesListNo=#{secSalesListNo},</if> <if test="secSalesListNo != null ">secSalesListNo=#{secSalesListNo},</if>
<if test="firstSalesInvNo != null">firstSalesInvNo=#{firstSalesInvNo},</if> <if test="firstSalesInvNo != null">firstSalesInvNo=#{firstSalesInvNo},</if>
<if test="secSalesInvNo != null">secSalesInvNo=#{secSalesInvNo},</if> <if test="secSalesInvNo != null">secSalesInvNo=#{secSalesInvNo},</if>
<if test="invoiceDate != null">invoiceDate=#{invoiceDate},</if> <if test="invoiceDate != null">invoiceDate=#{invoiceDate},</if>

@ -35,6 +35,44 @@
</select> </select>
<select id="filterAllByUser" parameterType="com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest"
resultType="com.glxp.sale.admin.entity.inventory.InvWarehouseEntity">
select inv_warehouse.* from inv_warehouse INNER JOIN inv_warehouse_user
on inv_warehouse.`code` =inv_warehouse_user.code
<where>
<if test="id != '' and id != null">
AND id = #{id}
</if>
<if test="pid != '' and pid != null">
AND pid = #{pid}
</if>
<if test="code != '' and code != null">
AND code = #{code}
</if>
<if test="name != '' and name != null">
AND name = #{name}
</if>
<if test=" advanceType != null">
AND advanceType = #{advanceType}
</if>
<if test="isDefault != null">
AND isDefault = #{isDefault}
</if>
<if test="pcode != null">
AND pcode = #{pcode}
</if>
<if test="userId != null">
AND inv_warehouse_user.userId = #{userId}
</if>
<if test="level != null">
AND level = #{level}
</if>
</where>
</select>
<select id="selectById" parameterType="Map" <select id="selectById" parameterType="Map"
resultType="com.glxp.sale.admin.entity.inventory.InvWarehouseEntity"> resultType="com.glxp.sale.admin.entity.inventory.InvWarehouseEntity">
SELECT * SELECT *

Loading…
Cancel
Save