代码备份，解决多个问题
anthonywj
4 years ago
parent
3f91437abe
commit
b8a992ac13
@ -0,0 +1,76 @@
|
|||||||
|
package com.glxp.api.admin.controller.auth;
|
||||||
|
|
||||||
|
import com.github.pagehelper.PageInfo;
|
||||||
|
import com.glxp.api.admin.entity.auth.AuthAdmin;
|
||||||
|
import com.glxp.api.admin.entity.auth.AuthCheckEntity;
|
||||||
|
import com.glxp.api.admin.req.auth.AuthAdminQueryRequest;
|
||||||
|
import com.glxp.api.admin.req.auth.AuthAdminSaveRequest;
|
||||||
|
import com.glxp.api.admin.req.auth.AuthCheckRequest;
|
||||||
|
import com.glxp.api.admin.res.PageSimpleResponse;
|
||||||
|
import com.glxp.api.admin.res.auth.AuthAdminResponse;
|
||||||
|
import com.glxp.api.admin.service.auth.AuthAdminService;
|
||||||
|
import com.glxp.api.admin.service.auth.AuthCheckService;
|
||||||
|
import com.glxp.api.admin.util.RsaUtils;
|
||||||
|
import com.glxp.api.common.enums.ResultEnum;
|
||||||
|
import com.glxp.api.common.res.BaseResponse;
|
||||||
|
import com.glxp.api.common.util.ResultVOUtils;
|
||||||
|
import org.springframework.validation.BindingResult;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RequestBody;
|
||||||
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
|
import javax.validation.Valid;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
public class AuthCheckController {
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private AuthCheckService authCheckService;
|
||||||
|
|
||||||
|
@GetMapping("/udiwms/auth/device/filter")
|
||||||
|
public BaseResponse index(AuthCheckRequest authCheckRequest,
|
||||||
|
BindingResult bindingResult) {
|
||||||
|
if (bindingResult.hasErrors()) {
|
||||||
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||||
|
}
|
||||||
|
List<AuthCheckEntity> authCheckEntityList = authCheckService.filterDevices(authCheckRequest);
|
||||||
|
|
||||||
|
PageInfo<AuthCheckEntity> authCheckEntityPageInfo = new PageInfo<>(authCheckEntityList);
|
||||||
|
PageSimpleResponse<AuthCheckEntity> authAdminResponseList = new PageSimpleResponse<>();
|
||||||
|
authAdminResponseList.setTotal(authCheckEntityPageInfo.getTotal());
|
||||||
|
authAdminResponseList.setList(authCheckEntityList);
|
||||||
|
|
||||||
|
return ResultVOUtils.success(authAdminResponseList);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/udiwms/auth/device/save")
|
||||||
|
public BaseResponse save(@RequestBody @Valid AuthCheckEntity authCheckEntity,
|
||||||
|
BindingResult bindingResult) {
|
||||||
|
|
||||||
|
if (bindingResult.hasErrors()) {
|
||||||
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
String key = null;
|
||||||
|
try {
|
||||||
|
key = RsaUtils.publicKeyDecrypt(authCheckEntity.getRegisterCode(), RsaUtils.publicKey);
|
||||||
|
if (key != null && key.equals(authCheckEntity.getMachineInfo())) {
|
||||||
|
authCheckService.updateDevices(authCheckEntity);
|
||||||
|
return ResultVOUtils.success("注册成功！");
|
||||||
|
} else {
|
||||||
|
return ResultVOUtils.error(500, "注册失败，注册码不匹配！");
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
return ResultVOUtils.error(500, "注册失败！");
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,44 @@
|
|||||||
|
package com.glxp.api.admin.controller.basic;
|
||||||
|
|
||||||
|
import com.github.pagehelper.PageInfo;
|
||||||
|
import com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity;
|
||||||
|
import com.glxp.api.admin.req.basic.BussinessOriginTypeFilterRequest;
|
||||||
|
import com.glxp.api.admin.res.PageSimpleResponse;
|
||||||
|
import com.glxp.api.admin.service.basic.BussinessOriginTypeService;
|
||||||
|
import com.glxp.api.common.enums.ResultEnum;
|
||||||
|
import com.glxp.api.common.res.BaseResponse;
|
||||||
|
import com.glxp.api.common.util.ResultVOUtils;
|
||||||
|
import org.springframework.validation.BindingResult;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
public class BussinessOriginTypeController {
|
||||||
|
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private BussinessOriginTypeService bussinessOriginTypeService;
|
||||||
|
|
||||||
|
|
||||||
|
@GetMapping("/udiwms/originBusType/filter")
|
||||||
|
public BaseResponse filterJoin(BussinessOriginTypeFilterRequest bussinessTypeFilterRequest,
|
||||||
|
BindingResult bindingResult) {
|
||||||
|
|
||||||
|
if (bindingResult.hasErrors()) {
|
||||||
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||||
|
}
|
||||||
|
List<BussinessOriginTypeEntity> bussinessTypeEntities;
|
||||||
|
bussinessTypeEntities = bussinessOriginTypeService.filterList(
|
||||||
|
bussinessTypeFilterRequest);
|
||||||
|
PageInfo<BussinessOriginTypeEntity> pageInfo;
|
||||||
|
pageInfo = new PageInfo<>(bussinessTypeEntities);
|
||||||
|
PageSimpleResponse<BussinessOriginTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||||
|
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||||
|
pageSimpleResponse.setList(bussinessTypeEntities);
|
||||||
|
return ResultVOUtils.success(pageSimpleResponse);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,454 @@
|
|||||||
|
package com.glxp.api.admin.controller.business;
|
||||||
|
|
||||||
|
import com.github.pagehelper.PageInfo;
|
||||||
|
import com.glxp.api.admin.constant.ConstantStatus;
|
||||||
|
import com.glxp.api.admin.controller.inventory.InvPrintController;
|
||||||
|
import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
|
||||||
|
import com.glxp.api.admin.entity.business.StockOrderEntity;
|
||||||
|
import com.glxp.api.admin.entity.business.StockQRCodeTextEntity;
|
||||||
|
import com.glxp.api.admin.entity.info.CompanyEntity;
|
||||||
|
import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
|
||||||
|
import com.glxp.api.admin.entity.inventory.StockPrintEntity;
|
||||||
|
import com.glxp.api.admin.entity.inventory.StockPrinttREntity;
|
||||||
|
import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest;
|
||||||
|
import com.glxp.api.admin.req.business.StockOrderFilterRequest;
|
||||||
|
import com.glxp.api.admin.req.business.StockOrderIdsRequest;
|
||||||
|
import com.glxp.api.admin.req.business.StockOrderPostRequest;
|
||||||
|
import com.glxp.api.admin.req.inout.DeleteRequest;
|
||||||
|
import com.glxp.api.admin.req.inventory.PostStockPrintRequest;
|
||||||
|
import com.glxp.api.admin.res.PageSimpleResponse;
|
||||||
|
import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
|
||||||
|
import com.glxp.api.admin.res.inout.ErpOrderResponse;
|
||||||
|
import com.glxp.api.admin.service.basic.UdiInfoService;
|
||||||
|
import com.glxp.api.admin.service.basic.UdiRelevanceService;
|
||||||
|
import com.glxp.api.admin.service.business.StockOrderDetailService;
|
||||||
|
import com.glxp.api.admin.service.business.StockOrderDetailTempService;
|
||||||
|
import com.glxp.api.admin.service.business.StockOrderService;
|
||||||
|
import com.glxp.api.admin.service.business.StockQRCodeTextService;
|
||||||
|
import com.glxp.api.admin.service.info.CompanyService;
|
||||||
|
import com.glxp.api.admin.service.info.SystemParamConfigService;
|
||||||
|
import com.glxp.api.admin.service.inout.CodesService;
|
||||||
|
import com.glxp.api.admin.service.inventory.InCodeLogService;
|
||||||
|
import com.glxp.api.admin.service.inventory.InvStockPrintService;
|
||||||
|
import com.glxp.api.admin.util.DateUtil;
|
||||||
|
import com.glxp.api.admin.util.StockOrderBillNoUtils;
|
||||||
|
import com.glxp.api.common.enums.ResultEnum;
|
||||||
|
import com.glxp.api.common.res.BaseResponse;
|
||||||
|
import com.glxp.api.common.util.ResultVOUtils;
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
import org.springframework.beans.BeanUtils;
|
||||||
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
import org.springframework.validation.BindingResult;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
public class StockOrderController {
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private StockOrderService stockOrderService;
|
||||||
|
@Resource
|
||||||
|
private CodesService codesService;
|
||||||
|
@Resource
|
||||||
|
private StockOrderDetailService stockOrderDetailService;
|
||||||
|
@Resource
|
||||||
|
private StockOrderDetailTempService stockOrderDetailTempService;
|
||||||
|
@Resource
|
||||||
|
private StockQRCodeTextService stockQRCodeTextService;
|
||||||
|
@Resource
|
||||||
|
private UdiInfoService udiInfoService;
|
||||||
|
@Resource
|
||||||
|
private UdiRelevanceService udiRelevanceService;
|
||||||
|
@Resource
|
||||||
|
private SystemParamConfigService systemParamConfigService;
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private InvPrintController invPrintController;
|
||||||
|
@Resource
|
||||||
|
InvStockPrintService stockPrintService;
|
||||||
|
@Resource
|
||||||
|
InCodeLogService inCodeLogService;
|
||||||
|
@Resource
|
||||||
|
CompanyService companyService;
|
||||||
|
|
||||||
|
@GetMapping("/udiwms/stock/order/error")
|
||||||
|
public BaseResponse listStockOrderNoDealWith(StockOrderFilterRequest stockOrderFilterRequest) {
|
||||||
|
List<StockOrderEntity> stockOrderEntityList = stockOrderService.filterListOr(stockOrderFilterRequest);
|
||||||
|
PageInfo<StockOrderEntity> pageInfo;
|
||||||
|
pageInfo = new PageInfo<>(stockOrderEntityList);
|
||||||
|
PageSimpleResponse<StockOrderEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||||
|
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||||
|
pageSimpleResponse.setList(stockOrderEntityList);
|
||||||
|
return ResultVOUtils.success(pageSimpleResponse);
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/udiwms/stock/order/postDealWith")
|
||||||
|
public BaseResponse postDealWith(@RequestBody StockOrderPostRequest stockOrderPostRequest, BindingResult bindingResult) {
|
||||||
|
|
||||||
|
if (bindingResult.hasErrors()) {
|
||||||
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||||
|
}
|
||||||
|
|
||||||
|
StockOrderEntity stockOrderEntity = new StockOrderEntity();
|
||||||
|
BeanUtils.copyProperties(stockOrderPostRequest, stockOrderEntity);
|
||||||
|
stockOrderEntity.setStatus(ConstantStatus.SORDER_DRAFT);//未处理
|
||||||
|
stockOrderEntity.setPrintStatus(ConstantStatus.SORDER_PRINT_UN);//未打印
|
||||||
|
stockOrderEntity.setSourceType(ConstantStatus.ST_THIRD_SEL);//外部提交
|
||||||
|
// stockOrderEntity.setId(String.valueOf(new Date().getTime()));
|
||||||
|
stockOrderEntity.setBilldate(DateUtil.formatDate(new Date()));
|
||||||
|
boolean b = stockOrderService.insertStockOrder(stockOrderEntity);
|
||||||
|
if (b) {
|
||||||
|
List<StockOrderDetailEntity> stockOrderDetailEntityList = stockOrderPostRequest.getSubErpOrders();
|
||||||
|
for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntityList) {
|
||||||
|
stockOrderDetailEntity.setOrderIdFk(stockOrderEntity.getId());
|
||||||
|
stockOrderDetailEntity.setSweepCount(0 + "");
|
||||||
|
}
|
||||||
|
stockOrderDetailTempService.insertStockOrderDetailTemps(stockOrderDetailEntityList);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ResultVOUtils.success("成功");
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/udiwms/stock/order/insertWeb")
|
||||||
|
public BaseResponse insertWeb(@RequestBody StockOrderPostRequest stockOrderPostRequest, BindingResult bindingResult) {
|
||||||
|
|
||||||
|
if (bindingResult.hasErrors()) {
|
||||||
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||||
|
}
|
||||||
|
|
||||||
|
boolean noRepeatBillNo = false;
|
||||||
|
boolean newBillNo = false;
|
||||||
|
StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
|
||||||
|
while (!noRepeatBillNo) {
|
||||||
|
if (newBillNo) {
|
||||||
|
String billNo = StockOrderBillNoUtils.getBillNo(stockOrderPostRequest.getBillType());
|
||||||
|
stockOrderPostRequest.setBillNo(billNo);
|
||||||
|
}
|
||||||
|
if (StringUtils.isBlank(stockOrderPostRequest.getBillNo())) {
|
||||||
|
newBillNo = true;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
stockOrderFilterRequest.setBillNo(stockOrderPostRequest.getBillNo());
|
||||||
|
if (stockOrderService.findOne(stockOrderFilterRequest) == null) {
|
||||||
|
noRepeatBillNo = true;
|
||||||
|
newBillNo = false;
|
||||||
|
} else {
|
||||||
|
newBillNo = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
StockOrderEntity stockOrderEntity = new StockOrderEntity();
|
||||||
|
BeanUtils.copyProperties(stockOrderPostRequest, stockOrderEntity);
|
||||||
|
|
||||||
|
stockOrderEntity.setStatus(
|
||||||
|
StringUtils.isBlank(stockOrderEntity.getStatus()) ? 501 + ""//未提交
|
||||||
|
: stockOrderEntity.getStatus());
|
||||||
|
stockOrderEntity.setPrintStatus(ConstantStatus.SORDER_PRINT_UN);//未打印
|
||||||
|
stockOrderEntity.setSourceType(ConstantStatus.ST_WEB_ADD);//本地网页新增
|
||||||
|
boolean b = false;
|
||||||
|
if (stockOrderEntity.getStatus().equals("502")) {//已提交
|
||||||
|
SystemParamConfigEntity systemParamConfigEntity =
|
||||||
|
systemParamConfigService.selectByParamKey("stock_order_new_submit_type");
|
||||||
|
if (systemParamConfigEntity == null || systemParamConfigEntity.getParamValue().equals("0")) {
|
||||||
|
stockOrderEntity.setStatus("201");//未配货
|
||||||
|
} else {
|
||||||
|
stockOrderEntity.setStatus("202");//已配货
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (StringUtils.isBlank(stockOrderEntity.getId())) {
|
||||||
|
|
||||||
|
CompanyEntity companyEntity = companyService.findCompany();
|
||||||
|
// stockOrderEntity.setCorpId(companyEntity.getUnitIdFk());
|
||||||
|
// stockOrderEntity.setCorpName(companyEntity.getCompanyName());
|
||||||
|
// stockOrderEntity.setUnitIdFk(companyEntity.getUnitIdFk());
|
||||||
|
stockOrderEntity.setCustomerId(stockOrderPostRequest.getCustomerId());
|
||||||
|
stockOrderEntity.setBilldate(DateUtil.formatDate(new Date()));
|
||||||
|
b = stockOrderService.insertStockOrder(stockOrderEntity);
|
||||||
|
} else {
|
||||||
|
stockOrderService.updateById(stockOrderEntity);
|
||||||
|
}
|
||||||
|
if (stockOrderPostRequest.getSubErpOrders() != null) {
|
||||||
|
List<StockOrderDetailEntity> stockOrderDetailEntityList = stockOrderPostRequest.getSubErpOrders();
|
||||||
|
for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntityList) {
|
||||||
|
stockOrderDetailEntity.setOrderIdFk(
|
||||||
|
StringUtils.isBlank(stockOrderDetailEntity.getOrderIdFk()) ?
|
||||||
|
stockOrderEntity.getId() : stockOrderDetailEntity.getOrderIdFk());
|
||||||
|
|
||||||
|
if (StringUtils.isBlank(stockOrderDetailEntity.getId())) {
|
||||||
|
stockOrderDetailEntity.setReCount(
|
||||||
|
StringUtils.isBlank(stockOrderDetailEntity.getReCount()) ? "0" : stockOrderDetailEntity.getReCount());
|
||||||
|
stockOrderDetailEntity.setCount(
|
||||||
|
StringUtils.isBlank(stockOrderDetailEntity.getCount()) ? "0" : stockOrderDetailEntity.getCount());
|
||||||
|
stockOrderDetailEntity.setSweepCount(
|
||||||
|
StringUtils.isBlank(stockOrderDetailEntity.getSweepCount()) ? "0" : stockOrderDetailEntity.getSweepCount());
|
||||||
|
|
||||||
|
stockOrderDetailService.insertStockOrderDetail(stockOrderDetailEntity);
|
||||||
|
} else {
|
||||||
|
stockOrderDetailService.updateById(stockOrderDetailEntity);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// stockOrderDetailService.insertStockOrderDetails(stockOrderDetailEntityList);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ResultVOUtils.success("成功");
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/udiwms/stock/order/delete")
|
||||||
|
public BaseResponse deleteOrder(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
|
||||||
|
|
||||||
|
if (bindingResult.hasErrors()) {
|
||||||
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||||
|
}
|
||||||
|
String id = deleteRequest.getId();
|
||||||
|
|
||||||
|
stockOrderService.deleteById(id);
|
||||||
|
stockOrderDetailService.deleteByOrderIdFk(id);
|
||||||
|
stockOrderDetailTempService.deleteByOrderIdFk(id);
|
||||||
|
return ResultVOUtils.success("删除成功");
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/udiwms/stock/order/error/delete")
|
||||||
|
public BaseResponse deleteErrorOrder(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
|
||||||
|
|
||||||
|
if (bindingResult.hasErrors()) {
|
||||||
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||||
|
}
|
||||||
|
String id = deleteRequest.getId();
|
||||||
|
|
||||||
|
stockOrderService.deleteById(id);
|
||||||
|
stockOrderDetailTempService.deleteByOrderIdFk(id);
|
||||||
|
return ResultVOUtils.success("删除成功");
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/udiwms/stock/order/filter")
|
||||||
|
public BaseResponse filterOrder(StockOrderFilterRequest stockOrderFilterRequest,
|
||||||
|
BindingResult bindingResult) {
|
||||||
|
|
||||||
|
if (bindingResult.hasErrors()) {
|
||||||
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||||
|
}
|
||||||
|
List<StockOrderEntity> stockOrderEntityList;
|
||||||
|
// if (stockOrderFilterRequest.getStatus() == null) {
|
||||||
|
// stockOrderFilterRequest.setStatus(0 + "");
|
||||||
|
// }
|
||||||
|
|
||||||
|
// if (StringUtils.isNotBlank(stockOrderFilterRequest.getCorpId())) {
|
||||||
|
// CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(stockOrderFilterRequest.getCorpId()));
|
||||||
|
// stockOrderFilterRequest.setUnitIdFk(companyEntity.getUnitIdFk());
|
||||||
|
// stockOrderFilterRequest.setCorpId(null);
|
||||||
|
// }
|
||||||
|
|
||||||
|
stockOrderEntityList = stockOrderService.filterListOr(stockOrderFilterRequest);
|
||||||
|
PageInfo<StockOrderEntity> pageInfo;
|
||||||
|
pageInfo = new PageInfo<>(stockOrderEntityList);
|
||||||
|
PageSimpleResponse<StockOrderEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||||
|
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||||
|
pageSimpleResponse.setList(stockOrderEntityList);
|
||||||
|
return ResultVOUtils.success(pageSimpleResponse);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@GetMapping("/udiwms/stock/order/filterDetail")
|
||||||
|
public BaseResponse filterDetail(StockOrderFilterRequest stockOrderFilterRequest,
|
||||||
|
BindingResult bindingResult) {
|
||||||
|
|
||||||
|
if (bindingResult.hasErrors()) {
|
||||||
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||||
|
}
|
||||||
|
if (stockOrderFilterRequest.getBillType() == null) {
|
||||||
|
stockOrderFilterRequest.setBillType(stockOrderFilterRequest.getBillAction());
|
||||||
|
}
|
||||||
|
List<ErpOrderResponse> erpOrderResponses = new ArrayList<>();
|
||||||
|
// if (stockOrderFilterRequest.getCustomerId() != null) {
|
||||||
|
// CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(stockOrderFilterRequest.getCustomerId()));
|
||||||
|
// stockOrderFilterRequest.setUnitIdFk(companyEntity.getUnitIdFk());
|
||||||
|
// }
|
||||||
|
|
||||||
|
List<StockOrderEntity> stockOrderEntityList;
|
||||||
|
stockOrderEntityList = stockOrderService.filterListOr(stockOrderFilterRequest);
|
||||||
|
if (stockOrderEntityList != null && stockOrderEntityList.size() > 0) {
|
||||||
|
|
||||||
|
|
||||||
|
for (StockOrderEntity stockOrderEntity : stockOrderEntityList) {
|
||||||
|
ErpOrderResponse erpOrderResponse = new ErpOrderResponse();
|
||||||
|
BeanUtils.copyProperties(stockOrderEntity, erpOrderResponse);
|
||||||
|
|
||||||
|
StockOrderDetailFilterRequest stockOrderDetailFilterRequest = new StockOrderDetailFilterRequest();
|
||||||
|
stockOrderDetailFilterRequest.setOrderIdFk(stockOrderEntity.getId());
|
||||||
|
List<StockOrderDetailEntity> stockOrderDetailEntityList
|
||||||
|
= stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest);
|
||||||
|
|
||||||
|
List<ErpOrderResponse.SubErpOrder> subErpOrders = new ArrayList<>();
|
||||||
|
if (stockOrderDetailEntityList != null && stockOrderDetailEntityList.size() > 0) {
|
||||||
|
for (StockOrderDetailEntity thrOrderDetailEntity : stockOrderDetailEntityList) {
|
||||||
|
ErpOrderResponse.SubErpOrder subErpOrder = new ErpOrderResponse.SubErpOrder();
|
||||||
|
BeanUtils.copyProperties(thrOrderDetailEntity, subErpOrder);
|
||||||
|
subErpOrders.add(subErpOrder);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
erpOrderResponse.setSubErpOrders(subErpOrders);
|
||||||
|
erpOrderResponses.add(erpOrderResponse);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
PageInfo<StockOrderEntity> pageInfo;
|
||||||
|
pageInfo = new PageInfo<>(stockOrderEntityList);
|
||||||
|
PageSimpleResponse<ErpOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||||
|
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||||
|
pageSimpleResponse.setList(erpOrderResponses);
|
||||||
|
return ResultVOUtils.success(pageSimpleResponse);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@GetMapping("/udiwms/stock/order/submit")
|
||||||
|
public BaseResponse submitStockOrder(@RequestParam("id") String id) {
|
||||||
|
StockOrderEntity stockOrderEntity = new StockOrderEntity();
|
||||||
|
stockOrderEntity.setId(id);
|
||||||
|
stockOrderEntity.setStatus(202 + "");//已配货
|
||||||
|
stockOrderService.updateById(stockOrderEntity);
|
||||||
|
return ResultVOUtils.success();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/udiwms/stock/order/new/submit")
|
||||||
|
public BaseResponse submitNewStockOrder(@RequestParam("id") String id) {
|
||||||
|
StockOrderEntity stockOrderEntity = new StockOrderEntity();
|
||||||
|
stockOrderEntity.setId(id);
|
||||||
|
stockOrderEntity.setStatus(502 + "");//已提交
|
||||||
|
stockOrderService.updateById(stockOrderEntity);
|
||||||
|
return ResultVOUtils.success();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/udiwms/stock/order/new/repealSubmit")
|
||||||
|
public BaseResponse repealSubmitNewStockOrder(@RequestParam("id") String id) {
|
||||||
|
StockOrderEntity stockOrderEntity = new StockOrderEntity();
|
||||||
|
stockOrderEntity.setId(id);
|
||||||
|
stockOrderEntity.setStatus(501 + "");//未提交
|
||||||
|
stockOrderService.updateById(stockOrderEntity);
|
||||||
|
return ResultVOUtils.success();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/udiwms/stock/order/error/submit")
|
||||||
|
public BaseResponse submitStockOrderError(@RequestParam("id") String id) {
|
||||||
|
StockOrderEntity stockOrderEntity = new StockOrderEntity();
|
||||||
|
stockOrderEntity.setId(id);
|
||||||
|
stockOrderEntity.setStatus(101 + "");//重新提交为未处理
|
||||||
|
stockOrderService.updateById(stockOrderEntity);
|
||||||
|
return ResultVOUtils.success();
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/udiwms/stock/order/qrcode/generate/text")
|
||||||
|
public BaseResponse generateStockOrderQRCodeText(@RequestBody StockOrderIdsRequest stockOrderIdsRequest) {
|
||||||
|
|
||||||
|
if (stockOrderIdsRequest.getIds().size() < 1) return ResultVOUtils.error(ResultEnum.DATA_ERROR);
|
||||||
|
StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
|
||||||
|
for (String id : stockOrderIdsRequest.getIds()) {
|
||||||
|
stockOrderFilterRequest.setId(id);
|
||||||
|
StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest);
|
||||||
|
stockPrintService.deleteByOrderId(stockOrderEntity.getId());
|
||||||
|
if (stockOrderEntity == null) continue;
|
||||||
|
StockOrderDetailFilterRequest stockOrderDetailFilterRequest = new StockOrderDetailFilterRequest();
|
||||||
|
stockOrderDetailFilterRequest.setLimit(100);
|
||||||
|
stockOrderDetailFilterRequest.setPage(1);
|
||||||
|
stockOrderDetailFilterRequest.setOrderIdFk(id);
|
||||||
|
List<StockOrderDetailEntity> stockOrderDetailEntityList =
|
||||||
|
stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest);
|
||||||
|
|
||||||
|
List<StockPrintEntity> stockPrintEntities = new ArrayList<>();
|
||||||
|
for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntityList) {
|
||||||
|
if (stockOrderIdsRequest.isFilterUDIType()) {
|
||||||
|
// UdiInfoEntity udiInfoEntity =
|
||||||
|
// udiInfoService.findByNameCode(stockOrderDetailEntity.getProductId());
|
||||||
|
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(stockOrderDetailEntity.getProductId());
|
||||||
|
if (udiRelevanceResponse != null && udiRelevanceResponse.getProductType() == ConstantStatus.PRODUCT_TYPE_THIRD) {//TODO udi过滤检测
|
||||||
|
StockPrintEntity stockPrintEntity = new StockPrintEntity();
|
||||||
|
stockPrintEntity.setSOrderId(stockOrderEntity.getId());
|
||||||
|
stockPrintEntity.setUpdateTime(new Date());
|
||||||
|
stockPrintEntity.setNameCode(stockOrderDetailEntity.getProductId());
|
||||||
|
stockPrintEntity.setProduceDate(stockOrderDetailEntity.getProductDate());
|
||||||
|
stockPrintEntity.setExpireDate(stockOrderDetailEntity.getExpireDate());
|
||||||
|
stockPrintEntity.setBatchNo(stockOrderDetailEntity.getBatchNo());
|
||||||
|
stockPrintEntity.setSDetailId(stockOrderDetailEntity.getId());
|
||||||
|
stockPrintEntities.add(stockPrintEntity);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
StockPrintEntity stockPrintEntity = new StockPrintEntity();
|
||||||
|
stockPrintEntity.setNameCode(stockOrderDetailEntity.getProductId());
|
||||||
|
stockPrintEntity.setSOrderId(stockOrderEntity.getId());
|
||||||
|
stockPrintEntity.setUpdateTime(new Date());
|
||||||
|
stockPrintEntity.setProduceDate(stockOrderDetailEntity.getProductDate());
|
||||||
|
stockPrintEntity.setExpireDate(stockOrderDetailEntity.getExpireDate());
|
||||||
|
stockPrintEntity.setBatchNo(stockOrderDetailEntity.getBatchNo());
|
||||||
|
stockPrintEntity.setSDetailId(stockOrderDetailEntity.getId());
|
||||||
|
stockPrintEntities.add(stockPrintEntity);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
PostStockPrintRequest postStockPrintRequest = new PostStockPrintRequest();
|
||||||
|
postStockPrintRequest.setThirdSys(stockOrderEntity.getThirdSysFk());
|
||||||
|
postStockPrintRequest.setDatas(stockPrintEntities);
|
||||||
|
if (stockPrintEntities.size() > 0) {
|
||||||
|
generateQRCodeText(postStockPrintRequest);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ResultVOUtils.success("操作成功，生成中。");
|
||||||
|
}
|
||||||
|
|
||||||
|
private String generateQRCodeText(PostStockPrintRequest postStockPrintRequest) {
|
||||||
|
String genKey = null;
|
||||||
|
if (postStockPrintRequest != null) {
|
||||||
|
|
||||||
|
// InCodeLogEntity inCodeLogEntity = new InCodeLogEntity();
|
||||||
|
// inCodeLogEntity.setFromType(IncodeStatus.FROM_THRSYS);
|
||||||
|
// inCodeLogEntity.setUpdateTime(new Date(System.currentTimeMillis()));
|
||||||
|
// if (postStockPrintRequest.getGenKey() == null) {
|
||||||
|
// genKey = CustomUtil.getId();
|
||||||
|
// inCodeLogEntity.setGenKey(genKey);
|
||||||
|
// } else {
|
||||||
|
// genKey = postStockPrintRequest.getGenKey();
|
||||||
|
// inCodeLogEntity.setGenKey(postStockPrintRequest.getGenKey());
|
||||||
|
// }
|
||||||
|
// inCodeLogEntity.setStatus(IncodeStatus.PROCESS);
|
||||||
|
// inCodeLogEntity.setThirdSysFk(postStockPrintRequest.getThirdSys());
|
||||||
|
// inCodeLogService.insertInCodeLog(inCodeLogEntity);
|
||||||
|
|
||||||
|
List<StockPrintEntity> stockPrintEntities = postStockPrintRequest.getDatas();
|
||||||
|
if (stockPrintEntities != null && stockPrintEntities.size() > 0) {
|
||||||
|
for (StockPrintEntity stockPrintEntity : stockPrintEntities) {
|
||||||
|
|
||||||
|
StockPrinttREntity stockPrinttREntity = new StockPrinttREntity();
|
||||||
|
BeanUtils.copyProperties(stockPrintEntity, stockPrinttREntity);
|
||||||
|
stockPrintEntity.setGenKeyFk(genKey);
|
||||||
|
String udiCode = "#" + stockPrinttREntity.getNameCode() + "#" + stockPrinttREntity.getProduceDate() + "#" + stockPrinttREntity.getExpireDate() +
|
||||||
|
"#" + stockPrinttREntity.getBatchNo() + "#" + stockPrinttREntity.getSerialNo() + "#" + stockPrinttREntity.getWarehouseCode() + "#" + stockPrinttREntity.getSpaceCode();
|
||||||
|
stockPrintEntity.setUdiCode(udiCode);
|
||||||
|
stockPrintService.insertStockPrint(stockPrintEntity);
|
||||||
|
|
||||||
|
//--------------------------
|
||||||
|
StockQRCodeTextEntity stockQRCodeTextEntity = new StockQRCodeTextEntity();
|
||||||
|
stockQRCodeTextEntity.setOrderId(stockPrintEntity.getSOrderId());
|
||||||
|
stockQRCodeTextEntity.setDetailId(stockPrintEntity.getSDetailId());
|
||||||
|
stockQRCodeTextEntity.setStatus(101 + "");//生成完成
|
||||||
|
stockQRCodeTextEntity.setText(genKey);
|
||||||
|
Date tDate = new Date();
|
||||||
|
stockQRCodeTextEntity.setCreate_time(tDate);
|
||||||
|
stockQRCodeTextEntity.setUpdate_time(tDate);
|
||||||
|
stockQRCodeTextService.insertStockQRCodeText(stockQRCodeTextEntity);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// inCodeLogEntity.setStatus(IncodeStatus.FINISH);
|
||||||
|
// inCodeLogService.updateInCodeLog(inCodeLogEntity);
|
||||||
|
}
|
||||||
|
return genKey;
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/udiwms/stock/order/generateBillNo")
|
||||||
|
public BaseResponse stockOrderGenerateBillNo(@RequestParam("action") String action) {
|
||||||
|
|
||||||
|
String billNo = StockOrderBillNoUtils.getBillNo(action);
|
||||||
|
|
||||||
|
return ResultVOUtils.success(billNo);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,475 @@
|
|||||||
|
package com.glxp.api.admin.controller.business;
|
||||||
|
|
||||||
|
import com.github.pagehelper.PageInfo;
|
||||||
|
import com.glxp.api.admin.entity.basic.UdiEntity;
|
||||||
|
import com.glxp.api.admin.entity.basic.UdiInfoEntity;
|
||||||
|
import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
|
||||||
|
import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
|
||||||
|
import com.glxp.api.admin.req.basic.FilterUdiInfoRequest;
|
||||||
|
import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest;
|
||||||
|
import com.glxp.api.admin.req.business.StockOrderIdsRequest;
|
||||||
|
import com.glxp.api.admin.req.info.SystemParamConfigRequest;
|
||||||
|
import com.glxp.api.admin.req.inout.DeleteRequest;
|
||||||
|
import com.glxp.api.admin.res.PageSimpleResponse;
|
||||||
|
import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
|
||||||
|
import com.glxp.api.admin.res.business.StockOrderDetailQueryProductResponse;
|
||||||
|
import com.glxp.api.admin.res.business.StockOrderDetailResponse;
|
||||||
|
import com.glxp.api.admin.service.basic.UdiInfoService;
|
||||||
|
import com.glxp.api.admin.service.basic.UdiRelevanceService;
|
||||||
|
import com.glxp.api.admin.service.business.StockOrderDetailService;
|
||||||
|
import com.glxp.api.admin.service.business.StockOrderDetailTempService;
|
||||||
|
import com.glxp.api.admin.service.business.StockQRCodeTextService;
|
||||||
|
import com.glxp.api.admin.service.info.SystemParamConfigService;
|
||||||
|
import com.glxp.api.admin.thread.IoTransInoutService;
|
||||||
|
import com.glxp.api.admin.util.FilterUdiUtils;
|
||||||
|
import com.glxp.api.common.enums.ResultEnum;
|
||||||
|
import com.glxp.api.common.res.BaseResponse;
|
||||||
|
import com.glxp.api.common.util.ResultVOUtils;
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
import org.springframework.beans.BeanUtils;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.validation.BindingResult;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
public class StockOrderDetailController {
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
StockOrderDetailService stockOrderDetailService;
|
||||||
|
@Resource
|
||||||
|
StockOrderDetailTempService stockOrderDetailTempService;
|
||||||
|
@Resource
|
||||||
|
StockQRCodeTextService stockQRCodeTextService;
|
||||||
|
@Resource
|
||||||
|
UdiInfoService udiInfoService;
|
||||||
|
@Resource
|
||||||
|
private UdiRelevanceService udiRelevanceService;
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private IoTransInoutService transInoutService;
|
||||||
|
@Autowired
|
||||||
|
private SystemParamConfigService systemParamConfigService;
|
||||||
|
|
||||||
|
@GetMapping("/udiwms/stock/order/detail/filter")
|
||||||
|
public BaseResponse filterStockOrderDetail(StockOrderDetailFilterRequest stockOrderDetailFilterRequest,
|
||||||
|
BindingResult bindingResult) {
|
||||||
|
|
||||||
|
if (bindingResult.hasErrors()) {
|
||||||
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||||
|
}
|
||||||
|
List<StockOrderDetailEntity> stockOrderDetailEntityList
|
||||||
|
= stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest);
|
||||||
|
PageInfo<StockOrderDetailEntity> pageInfo;
|
||||||
|
pageInfo = new PageInfo<>(stockOrderDetailEntityList);
|
||||||
|
PageSimpleResponse<StockOrderDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||||
|
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||||
|
pageSimpleResponse.setList(stockOrderDetailEntityList);
|
||||||
|
return ResultVOUtils.success(pageSimpleResponse);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/udiwms/stock/order/detail/filter2")
|
||||||
|
public BaseResponse filterStockOrderDetail2(StockOrderDetailFilterRequest stockOrderDetailFilterRequest,
|
||||||
|
BindingResult bindingResult) {
|
||||||
|
|
||||||
|
if (bindingResult.hasErrors()) {
|
||||||
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||||
|
}
|
||||||
|
List<StockOrderDetailResponse> stockOrderDetailResponseList
|
||||||
|
= stockOrderDetailService.filterStockOrderDetail2(stockOrderDetailFilterRequest);
|
||||||
|
PageInfo<StockOrderDetailResponse> pageInfo;
|
||||||
|
for (StockOrderDetailResponse stockOrderDetailResponse : stockOrderDetailResponseList) {
|
||||||
|
stockOrderDetailResponse.setProductName(stockOrderDetailResponse.getCpmctymc());
|
||||||
|
stockOrderDetailResponse.setSpec(stockOrderDetailResponse.getGgxh());
|
||||||
|
}
|
||||||
|
pageInfo = new PageInfo<>(stockOrderDetailResponseList);
|
||||||
|
PageSimpleResponse<StockOrderDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||||
|
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||||
|
pageSimpleResponse.setList(stockOrderDetailResponseList);
|
||||||
|
return ResultVOUtils.success(pageSimpleResponse);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/udiwms/stock/order/detail/temp/filter")
|
||||||
|
public BaseResponse filterStockOrderDetailTemp(StockOrderDetailFilterRequest stockOrderDetailFilterRequest,
|
||||||
|
BindingResult bindingResult) {
|
||||||
|
|
||||||
|
if (bindingResult.hasErrors()) {
|
||||||
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||||
|
}
|
||||||
|
List<StockOrderDetailEntity> stockOrderDetailEntityList
|
||||||
|
= stockOrderDetailTempService.filterStockOrderDetailTemp(stockOrderDetailFilterRequest);
|
||||||
|
PageInfo<StockOrderDetailEntity> pageInfo;
|
||||||
|
pageInfo = new PageInfo<>(stockOrderDetailEntityList);
|
||||||
|
PageSimpleResponse<StockOrderDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||||
|
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||||
|
pageSimpleResponse.setList(stockOrderDetailEntityList);
|
||||||
|
return ResultVOUtils.success(pageSimpleResponse);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@GetMapping("/udiwms/stock/order/detail/getStockOrderDetails")
|
||||||
|
public BaseResponse getStockOrderDetails(StockOrderDetailFilterRequest stockOrderDetailFilterRequest,
|
||||||
|
BindingResult bindingResult) {
|
||||||
|
|
||||||
|
if (bindingResult.hasErrors()) {
|
||||||
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||||
|
}
|
||||||
|
List<StockOrderDetailEntity> stockOrderDetailEntityList
|
||||||
|
= stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest);
|
||||||
|
PageInfo<StockOrderDetailEntity> pageInfo;
|
||||||
|
pageInfo = new PageInfo<>(stockOrderDetailEntityList);
|
||||||
|
PageSimpleResponse<StockOrderDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||||
|
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||||
|
pageSimpleResponse.setList(stockOrderDetailEntityList);
|
||||||
|
return ResultVOUtils.success(pageSimpleResponse);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@GetMapping(value = "/udiwms/stock/order/detail")
|
||||||
|
public BaseResponse stockOrderDetail(StockOrderDetailFilterRequest stockOrderDetailFilterRequest,
|
||||||
|
BindingResult bindingResult) {
|
||||||
|
if (bindingResult.hasErrors()) {
|
||||||
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||||
|
}
|
||||||
|
if (stockOrderDetailFilterRequest.getOrderIdFk() == null || stockOrderDetailFilterRequest.getOrderIdFk().equals("")) {
|
||||||
|
stockOrderDetailFilterRequest.setOrderIdFk("1");
|
||||||
|
}
|
||||||
|
stockOrderDetailFilterRequest.setPage(1);
|
||||||
|
stockOrderDetailFilterRequest.setLimit(100);
|
||||||
|
List<StockOrderDetailEntity> erpOrderEntities = stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest);
|
||||||
|
return ResultVOUtils.success(erpOrderEntities);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/udiwms/stock/order/detail/uploadCount")
|
||||||
|
public BaseResponse uploadCount(@RequestParam("orderId") String orderId, @RequestParam("code") String code) {
|
||||||
|
UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
|
||||||
|
if (udiEntity == null)
|
||||||
|
return ResultVOUtils.error(ResultEnum.DATA_ERROR, "条码错误 1");
|
||||||
|
if (StringUtils.isBlank(udiEntity.getUdi()))
|
||||||
|
return ResultVOUtils.error(ResultEnum.DATA_ERROR, "条码错误 2");
|
||||||
|
|
||||||
|
UdiInfoEntity udiInfoEntity =
|
||||||
|
udiInfoService.findByNameCode(udiEntity.getUdi());
|
||||||
|
if (udiInfoEntity == null) {
|
||||||
|
return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到该产品");
|
||||||
|
}
|
||||||
|
|
||||||
|
StockOrderDetailFilterRequest stockOrderDetailFilterRequest = new StockOrderDetailFilterRequest();
|
||||||
|
stockOrderDetailFilterRequest.setOrderIdFk(orderId);
|
||||||
|
stockOrderDetailFilterRequest.setProductId(udiEntity.getUdi());
|
||||||
|
List<StockOrderDetailEntity> stockOrderDetailEntityList =
|
||||||
|
stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest);
|
||||||
|
if (stockOrderDetailEntityList.size() > 0) {
|
||||||
|
SystemParamConfigEntity systemParamConfigEntitySODCountMax =
|
||||||
|
systemParamConfigService.selectByParamKey("stock_order_detail_count_max");
|
||||||
|
|
||||||
|
StockOrderDetailEntity tempStockOrderDetailEntity = stockOrderDetailEntityList.get(0);
|
||||||
|
StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity();
|
||||||
|
stockOrderDetailEntity.setId(tempStockOrderDetailEntity.getId());
|
||||||
|
|
||||||
|
if (systemParamConfigEntitySODCountMax == null ||
|
||||||
|
StringUtils.isNotBlank(systemParamConfigEntitySODCountMax.getParamValue()) &&
|
||||||
|
systemParamConfigEntitySODCountMax.getParamValue().equals("1")) {
|
||||||
|
if (Integer.parseInt(tempStockOrderDetailEntity.getCount()) <
|
||||||
|
Integer.parseInt(tempStockOrderDetailEntity.getReCount())) {
|
||||||
|
return ResultVOUtils.error(500, "配货数量超过订单数量");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
stockOrderDetailEntity.setReCount(
|
||||||
|
String.valueOf(Integer.parseInt(tempStockOrderDetailEntity.getReCount()) + 1));
|
||||||
|
stockOrderDetailService.updateById(stockOrderDetailEntity);
|
||||||
|
|
||||||
|
return ResultVOUtils.success(orderId);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ResultVOUtils.error(ResultEnum.DATA_NOT);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/udiwms/stock/order/detail/getInstrument")
|
||||||
|
public BaseResponse getStockOrderDetailInstrument(@RequestParam("count") String count, @RequestParam("code") String code) {
|
||||||
|
UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
|
||||||
|
if (udiEntity == null) ResultVOUtils.error(ResultEnum.DATA_ERROR, "条码错误 1");
|
||||||
|
|
||||||
|
UdiInfoEntity udiInfoEntity =
|
||||||
|
udiInfoService.findByNameCode(udiEntity.getUdi());
|
||||||
|
if (udiInfoEntity != null) {
|
||||||
|
StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity();
|
||||||
|
stockOrderDetailEntity.setProductId(udiInfoEntity.getNameCode());
|
||||||
|
stockOrderDetailEntity.setProductName(udiInfoEntity.getCpmctymc());
|
||||||
|
stockOrderDetailEntity.setSpec(udiInfoEntity.getGgxh());
|
||||||
|
stockOrderDetailEntity.setBatchNo(udiEntity.getBatchNo());
|
||||||
|
stockOrderDetailEntity.setProductDate(udiEntity.getProduceDate());
|
||||||
|
stockOrderDetailEntity.setExpireDate(udiEntity.getExpireDate());
|
||||||
|
stockOrderDetailEntity.setCount(count);
|
||||||
|
|
||||||
|
return ResultVOUtils.success(stockOrderDetailEntity);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到该产品");
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/udiwms/stock/order/detail/getInstrumentById")
|
||||||
|
public BaseResponse getStockOrderDetailInstrumentById(@RequestBody StockOrderIdsRequest stockOrderIdsRequest) {
|
||||||
|
|
||||||
|
List<StockOrderDetailEntity> stockOrderDetailEntityList = new ArrayList<>();
|
||||||
|
for (String id : stockOrderIdsRequest.getIds()) {
|
||||||
|
FilterUdiInfoRequest companyProductRelevanceRequest = new FilterUdiInfoRequest();
|
||||||
|
companyProductRelevanceRequest.setId(id);
|
||||||
|
companyProductRelevanceRequest.setDiType(1);
|
||||||
|
List<UdiRelevanceResponse> companyProductRelevanceResponses = udiRelevanceService.filterUdiGp(companyProductRelevanceRequest);
|
||||||
|
|
||||||
|
if (companyProductRelevanceResponses != null && companyProductRelevanceResponses.size() > 0) {
|
||||||
|
UdiRelevanceResponse udiInfoEntity = companyProductRelevanceResponses.get(0);
|
||||||
|
StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity();
|
||||||
|
stockOrderDetailEntity.setProductId(udiInfoEntity.getId() + "");
|
||||||
|
stockOrderDetailEntity.setProductName(udiInfoEntity.getCpmctymc());
|
||||||
|
stockOrderDetailEntity.setSpec(udiInfoEntity.getGgxh());
|
||||||
|
if (stockOrderIdsRequest.getUdiEntity() != null) {
|
||||||
|
UdiEntity udiEntity = stockOrderIdsRequest.getUdiEntity();
|
||||||
|
stockOrderDetailEntity.setBatchNo(udiEntity.getBatchNo());
|
||||||
|
stockOrderDetailEntity.setProductDate(udiEntity.getProduceDate());
|
||||||
|
stockOrderDetailEntity.setExpireDate(udiEntity.getExpireDate());
|
||||||
|
}
|
||||||
|
stockOrderDetailEntity.setCount(0 + "");
|
||||||
|
stockOrderDetailEntity.setReCount(0 + "");
|
||||||
|
stockOrderDetailEntity.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc());
|
||||||
|
stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh());
|
||||||
|
stockOrderDetailEntityList.add(stockOrderDetailEntity);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (stockOrderDetailEntityList.size() == 0) {
|
||||||
|
return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到产品");
|
||||||
|
}
|
||||||
|
return ResultVOUtils.success(stockOrderDetailEntityList);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/udiwms/stock/order/detail/addFromCode")
|
||||||
|
public BaseResponse addStockOrderDetailFromCode(@RequestParam("orderId") String orderId,
|
||||||
|
@RequestParam("count") String count,
|
||||||
|
@RequestParam("code") String code) {
|
||||||
|
UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
|
||||||
|
if (udiEntity == null) ResultVOUtils.error(ResultEnum.DATA_ERROR, "条码错误 1");
|
||||||
|
|
||||||
|
UdiInfoEntity udiInfoEntity =
|
||||||
|
udiInfoService.findByNameCode(udiEntity.getUdi());
|
||||||
|
if (udiInfoEntity != null) {
|
||||||
|
StockOrderDetailFilterRequest stockOrderDetailFilterRequest = new StockOrderDetailFilterRequest();
|
||||||
|
stockOrderDetailFilterRequest.setOrderIdFk(orderId);
|
||||||
|
stockOrderDetailFilterRequest.setProductId(udiEntity.getUdi());
|
||||||
|
stockOrderDetailFilterRequest.setBatchNo(udiEntity.getBatchNo());
|
||||||
|
stockOrderDetailFilterRequest.setProductDate(udiEntity.getProduceDate());
|
||||||
|
stockOrderDetailFilterRequest.setExpireDate(udiEntity.getExpireDate());
|
||||||
|
if (stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest).size() > 0) {
|
||||||
|
return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "已添加");
|
||||||
|
}
|
||||||
|
|
||||||
|
StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity();
|
||||||
|
stockOrderDetailEntity.setOrderIdFk(orderId);
|
||||||
|
stockOrderDetailEntity.setProductId(udiInfoEntity.getNameCode());
|
||||||
|
stockOrderDetailEntity.setProductName(udiInfoEntity.getCpmctymc());
|
||||||
|
stockOrderDetailEntity.setSpec(udiInfoEntity.getGgxh());
|
||||||
|
stockOrderDetailEntity.setBatchNo(udiEntity.getBatchNo());
|
||||||
|
stockOrderDetailEntity.setProductDate(udiEntity.getProduceDate());
|
||||||
|
stockOrderDetailEntity.setExpireDate(udiEntity.getExpireDate());
|
||||||
|
stockOrderDetailEntity.setCount(count);
|
||||||
|
stockOrderDetailEntity.setReCount(count);
|
||||||
|
stockOrderDetailEntity.setSweepCount(0 + "");
|
||||||
|
stockOrderDetailEntity.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc());
|
||||||
|
stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh());
|
||||||
|
|
||||||
|
stockOrderDetailService.insertStockOrderDetail(stockOrderDetailEntity);
|
||||||
|
|
||||||
|
return ResultVOUtils.success();
|
||||||
|
}
|
||||||
|
|
||||||
|
return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到该产品");
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/udiwms/stock/order/detail/addFromCodeById")
|
||||||
|
public BaseResponse addStockOrderDetailFromCodeById(@RequestParam("orderId") String orderId,
|
||||||
|
@RequestParam("id") String id) {
|
||||||
|
UdiInfoEntity udiInfoEntity =
|
||||||
|
udiInfoService.findByNameCode(id);
|
||||||
|
if (udiInfoEntity != null) {
|
||||||
|
|
||||||
|
StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity();
|
||||||
|
stockOrderDetailEntity.setOrderIdFk(orderId);
|
||||||
|
stockOrderDetailEntity.setProductId(udiInfoEntity.getNameCode());
|
||||||
|
stockOrderDetailEntity.setProductName(udiInfoEntity.getCpmctymc());
|
||||||
|
stockOrderDetailEntity.setSpec(udiInfoEntity.getGgxh());
|
||||||
|
stockOrderDetailEntity.setBatchNo(udiInfoEntity.getBatchNo());
|
||||||
|
stockOrderDetailEntity.setProductDate(udiInfoEntity.getProduceDate());
|
||||||
|
stockOrderDetailEntity.setExpireDate(udiInfoEntity.getExpireDate());
|
||||||
|
stockOrderDetailEntity.setCount(0 + "");
|
||||||
|
stockOrderDetailEntity.setReCount(0 + "");
|
||||||
|
stockOrderDetailEntity.setSweepCount(0 + "");
|
||||||
|
stockOrderDetailEntity.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc());
|
||||||
|
stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh());
|
||||||
|
|
||||||
|
stockOrderDetailService.insertStockOrderDetail(stockOrderDetailEntity);
|
||||||
|
|
||||||
|
return ResultVOUtils.success();
|
||||||
|
}
|
||||||
|
|
||||||
|
return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到该产品");
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/udiwms/stock/order/detail/queryProduct")
|
||||||
|
public BaseResponse queryProduct(@RequestParam("code") String code, @RequestParam("customerId") String customerId) {
|
||||||
|
UdiEntity udiEntity = null;
|
||||||
|
if (StringUtils.isNotBlank(code)) {
|
||||||
|
|
||||||
|
if (code.length() > 13) {
|
||||||
|
String tStr = code.substring(0, 2);
|
||||||
|
if (tStr.contains("MA") || tStr.contains("#") || tStr.contains("01")) {
|
||||||
|
try {
|
||||||
|
udiEntity = FilterUdiUtils.getUdi(code);
|
||||||
|
} catch (Exception e) {
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
StockOrderDetailQueryProductResponse stockOrderDetailQueryProductResponse = new StockOrderDetailQueryProductResponse();
|
||||||
|
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
|
||||||
|
|
||||||
|
if (udiEntity == null) {
|
||||||
|
filterUdiInfoRequest.setUnionCode(code);
|
||||||
|
stockOrderDetailQueryProductResponse.setUdi(code);
|
||||||
|
} else {
|
||||||
|
filterUdiInfoRequest.setUnionCode(udiEntity.getUdi());
|
||||||
|
BeanUtils.copyProperties(udiEntity, stockOrderDetailQueryProductResponse);
|
||||||
|
}
|
||||||
|
List<UdiRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
|
||||||
|
basicInstrumentMaintainRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
|
||||||
|
if (basicInstrumentMaintainRelevanceResponses.size() == 1) {
|
||||||
|
stockOrderDetailQueryProductResponse.setGetType("1");
|
||||||
|
stockOrderDetailQueryProductResponse.setGetId(basicInstrumentMaintainRelevanceResponses.get(0).getId() + "");
|
||||||
|
} else if (basicInstrumentMaintainRelevanceResponses.size() > 1) {
|
||||||
|
stockOrderDetailQueryProductResponse.setGetType("2");
|
||||||
|
} else {
|
||||||
|
return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到产品");
|
||||||
|
}
|
||||||
|
return ResultVOUtils.success(stockOrderDetailQueryProductResponse);
|
||||||
|
} else {
|
||||||
|
return ResultVOUtils.error(ResultEnum.DATA_NOT, "条码不能为空");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/udiwms/stock/order/detail/filterProduct")
|
||||||
|
public BaseResponse filterProduct(FilterUdiInfoRequest filterUdiInfoRequest) {
|
||||||
|
|
||||||
|
String nameCode = null;
|
||||||
|
|
||||||
|
UdiEntity udiEntity = null;
|
||||||
|
|
||||||
|
if (filterUdiInfoRequest.getUdiCode() != null && !filterUdiInfoRequest.getUdiCode().isEmpty()) {
|
||||||
|
udiEntity = FilterUdiUtils.getUdi(filterUdiInfoRequest.getUdiCode());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (udiEntity != null) {
|
||||||
|
nameCode = udiEntity.getUdi();
|
||||||
|
} else {
|
||||||
|
nameCode = filterUdiInfoRequest.getNameCode();
|
||||||
|
}
|
||||||
|
|
||||||
|
filterUdiInfoRequest.setNameCode(nameCode);
|
||||||
|
filterUdiInfoRequest.setDiType(1);
|
||||||
|
List<UdiRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
|
||||||
|
basicInstrumentMaintainRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
|
||||||
|
|
||||||
|
//todo 为什么要把去掉使用单元
|
||||||
|
// if (basicInstrumentMaintainRelevanceResponses != null && basicInstrumentMaintainRelevanceResponses.size() > 0) {
|
||||||
|
// for (CompanyProductRelevanceResponse basicInstrumentMaintainRelevanceResponse : basicInstrumentMaintainRelevanceResponses) {
|
||||||
|
// if (basicInstrumentMaintainRelevanceResponse.getDiType() == 2 && basicInstrumentMaintainRelevanceResponse.getIsUseDy() != 1) {
|
||||||
|
// basicInstrumentMaintainRelevanceResponse.setNameCode(basicInstrumentMaintainRelevanceResponse.getSjcpbm());
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
PageInfo<UdiRelevanceResponse> pageInfo;
|
||||||
|
pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses);
|
||||||
|
PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||||
|
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||||
|
pageSimpleResponse.setList(basicInstrumentMaintainRelevanceResponses);
|
||||||
|
return ResultVOUtils.success(pageSimpleResponse);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/udiwms/stock/order/detail/copy")
|
||||||
|
public BaseResponse uploadCount(@RequestParam("id") String id) {
|
||||||
|
if (StringUtils.isNotBlank(id)) {
|
||||||
|
StockOrderDetailEntity stockOrderDetailEntity = stockOrderDetailService.findOne(id);
|
||||||
|
if (stockOrderDetailEntity != null) {
|
||||||
|
stockOrderDetailEntity.setId(null);
|
||||||
|
// stockOrderDetailEntity.setReCount(0 + "");
|
||||||
|
stockOrderDetailService.insertStockOrderDetail(stockOrderDetailEntity);
|
||||||
|
return ResultVOUtils.success();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ResultVOUtils.error(ResultEnum.DATA_NOT);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@GetMapping(value = "/udiwms/stock/order/detail/upload")
|
||||||
|
public BaseResponse upload(StockOrderDetailFilterRequest stockOrderDetailFilterRequest,
|
||||||
|
BindingResult bindingResult) {
|
||||||
|
if (bindingResult.hasErrors()) {
|
||||||
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||||
|
}
|
||||||
|
if (StringUtils.isNotBlank(stockOrderDetailFilterRequest.getId())) {
|
||||||
|
if (StringUtils.isBlank(stockOrderDetailFilterRequest.getCount()) ||
|
||||||
|
StringUtils.isBlank(stockOrderDetailFilterRequest.getReCount())) {
|
||||||
|
return ResultVOUtils.error(500, "获取数量失败");
|
||||||
|
}
|
||||||
|
SystemParamConfigEntity systemParamConfigEntitySODCountMax = systemParamConfigService.selectByParamKey("stock_order_detail_count_max");
|
||||||
|
if (systemParamConfigEntitySODCountMax == null) return ResultVOUtils.error(500, "获取设置失败");
|
||||||
|
|
||||||
|
if (StringUtils.isNotBlank(systemParamConfigEntitySODCountMax.getParamValue()) &&
|
||||||
|
systemParamConfigEntitySODCountMax.getParamValue().equals("1")) {
|
||||||
|
if (Integer.parseInt(stockOrderDetailFilterRequest.getCount()) <
|
||||||
|
Integer.parseInt(stockOrderDetailFilterRequest.getReCount())) {
|
||||||
|
return ResultVOUtils.error(500, "数量超过订单数量");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity();
|
||||||
|
BeanUtils.copyProperties(stockOrderDetailFilterRequest, stockOrderDetailEntity);
|
||||||
|
boolean b = stockOrderDetailService.updateById(stockOrderDetailEntity);
|
||||||
|
if (b) {
|
||||||
|
return ResultVOUtils.success();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ResultVOUtils.error(500, "修改失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/udiwms/stock/order/detail/delete")
|
||||||
|
public BaseResponse delete(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
|
||||||
|
|
||||||
|
if (bindingResult.hasErrors()) {
|
||||||
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||||
|
}
|
||||||
|
boolean b = stockOrderDetailService.deleteById(deleteRequest.getId());
|
||||||
|
if (b) {
|
||||||
|
return ResultVOUtils.success("删除成功");
|
||||||
|
} else {
|
||||||
|
return ResultVOUtils.error(500, "删除失败");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/udiwms/stock/order/detail/temp/delete")
|
||||||
|
public BaseResponse deleteTemp(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
|
||||||
|
|
||||||
|
if (bindingResult.hasErrors()) {
|
||||||
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||||
|
}
|
||||||
|
boolean b = stockOrderDetailTempService.deleteById(deleteRequest.getId());
|
||||||
|
if (b) {
|
||||||
|
return ResultVOUtils.success("删除成功");
|
||||||
|
} else {
|
||||||
|
return ResultVOUtils.error(500, "删除失败");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,248 @@
|
|||||||
|
package com.glxp.api.admin.controller.business;
|
||||||
|
|
||||||
|
import com.github.pagehelper.PageInfo;
|
||||||
|
import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
|
||||||
|
import com.glxp.api.admin.entity.business.StockOrderEntity;
|
||||||
|
import com.glxp.api.admin.entity.business.StockOrderPrintEntity;
|
||||||
|
import com.glxp.api.admin.entity.business.StockQRCodeTextEntity;
|
||||||
|
import com.glxp.api.admin.entity.info.SystemPDFModuleEntity;
|
||||||
|
import com.glxp.api.admin.entity.info.SystemPDFTemplateEntity;
|
||||||
|
import com.glxp.api.admin.entity.inventory.StockPrintEntity;
|
||||||
|
import com.glxp.api.admin.req.business.StockQRCodeTextFilterRequest;
|
||||||
|
import com.glxp.api.admin.req.inout.DeleteRequest;
|
||||||
|
import com.glxp.api.admin.req.itextpdf.InspectionPDFTemplateRequest;
|
||||||
|
import com.glxp.api.admin.req.itextpdf.StockQRCodeTextPDFTemplateRequest;
|
||||||
|
import com.glxp.api.admin.res.PageSimpleResponse;
|
||||||
|
import com.glxp.api.admin.service.basic.BussinessTypeService;
|
||||||
|
import com.glxp.api.admin.service.basic.UdiInfoService;
|
||||||
|
import com.glxp.api.admin.service.basic.UdiRelevanceService;
|
||||||
|
import com.glxp.api.admin.service.business.StockOrderDetailService;
|
||||||
|
import com.glxp.api.admin.service.business.StockOrderDetailTempService;
|
||||||
|
import com.glxp.api.admin.service.business.StockOrderService;
|
||||||
|
import com.glxp.api.admin.service.business.StockQRCodeTextService;
|
||||||
|
import com.glxp.api.admin.service.info.SystemPDFModuleService;
|
||||||
|
import com.glxp.api.admin.service.info.SystemPDFTemplateService;
|
||||||
|
import com.glxp.api.admin.service.info.SystemParamConfigService;
|
||||||
|
import com.glxp.api.admin.service.inventory.InvStockPrintService;
|
||||||
|
import com.glxp.api.admin.thread.IoTransInoutService;
|
||||||
|
import com.glxp.api.admin.util.JasperUtils;
|
||||||
|
import com.glxp.api.common.enums.ResultEnum;
|
||||||
|
import com.glxp.api.common.res.BaseResponse;
|
||||||
|
import com.glxp.api.common.util.ResultVOUtils;
|
||||||
|
import org.springframework.beans.BeanUtils;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.validation.BindingResult;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RequestBody;
|
||||||
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
|
import javax.servlet.http.HttpServletRequest;
|
||||||
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
public class StockQRCodeTextController {
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
StockOrderService stockOrderService;
|
||||||
|
@Resource
|
||||||
|
StockOrderDetailService stockOrderDetailService;
|
||||||
|
@Resource
|
||||||
|
StockOrderDetailTempService stockOrderDetailTempService;
|
||||||
|
@Resource
|
||||||
|
StockQRCodeTextService stockQRCodeTextService;
|
||||||
|
@Resource
|
||||||
|
UdiInfoService udiInfoService;
|
||||||
|
@Resource
|
||||||
|
private UdiRelevanceService udiRelevanceService;
|
||||||
|
@Resource
|
||||||
|
private SystemPDFTemplateService systemPDFTemplateService;
|
||||||
|
@Resource
|
||||||
|
private SystemPDFModuleService systemPDFModuleService;
|
||||||
|
@Resource
|
||||||
|
private BussinessTypeService bussinessTypeService;
|
||||||
|
@Resource
|
||||||
|
InvStockPrintService stockPrintService;
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private IoTransInoutService transInoutService;
|
||||||
|
@Autowired
|
||||||
|
private SystemParamConfigService systemParamConfigService;
|
||||||
|
|
||||||
|
@GetMapping("/udiwms/stock/qrcode/text/filter")
|
||||||
|
public BaseResponse filterStockQRCodeText(StockQRCodeTextFilterRequest stockQRCodeTextFilterRequest,
|
||||||
|
BindingResult bindingResult) {
|
||||||
|
|
||||||
|
if (bindingResult.hasErrors()) {
|
||||||
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||||
|
}
|
||||||
|
List<StockQRCodeTextEntity> stockQRCodeTextEntityList
|
||||||
|
= stockQRCodeTextService.filterStockQRCodeText(stockQRCodeTextFilterRequest);
|
||||||
|
for (StockQRCodeTextEntity stockQRCodeTextEntity : stockQRCodeTextEntityList) {
|
||||||
|
StockOrderDetailEntity stockOrderDetailEntity = stockOrderDetailService.findOne(stockQRCodeTextEntity.getDetailId());
|
||||||
|
if (stockOrderDetailEntity != null) {
|
||||||
|
stockQRCodeTextEntity.setCount(stockOrderDetailEntity.getCount());
|
||||||
|
stockQRCodeTextEntity.setReCount(stockOrderDetailEntity.getReCount());
|
||||||
|
} else {
|
||||||
|
stockQRCodeTextEntity.setCount("0");
|
||||||
|
stockQRCodeTextEntity.setReCount("0");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
PageInfo<StockQRCodeTextEntity> pageInfo;
|
||||||
|
pageInfo = new PageInfo<>(stockQRCodeTextEntityList);
|
||||||
|
PageSimpleResponse<StockQRCodeTextEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||||
|
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||||
|
pageSimpleResponse.setList(stockQRCodeTextEntityList);
|
||||||
|
return ResultVOUtils.success(pageSimpleResponse);
|
||||||
|
}
|
||||||
|
|
||||||
|
//-----------打印码
|
||||||
|
@PostMapping("/udiwms/pdf/template/inspection/stock/qrcode/text/file")
|
||||||
|
public BaseResponse inspectionStockQRCodeTextPDFFromTemplateFile(
|
||||||
|
@RequestBody InspectionPDFTemplateRequest inspectionPDFTemplateRequest) throws Exception {
|
||||||
|
|
||||||
|
StockPrintEntity stockPrintEntity = stockPrintService.selectById(inspectionPDFTemplateRequest.getQueryId());
|
||||||
|
if (stockPrintEntity == null) {
|
||||||
|
return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到该码");
|
||||||
|
}
|
||||||
|
SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(3 + "");
|
||||||
|
if (systemPDFModuleEntity == null) return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误");
|
||||||
|
SystemPDFTemplateEntity systemPDFTemplateEntity =
|
||||||
|
systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId()));
|
||||||
|
if (systemPDFTemplateEntity == null) return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误");
|
||||||
|
|
||||||
|
|
||||||
|
return ResultVOUtils.success();
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/udiwms/pdf/template/stock/qrcode/text/file")
|
||||||
|
public void stockQRCodeTextPDFFromTemplateFile(
|
||||||
|
@RequestBody StockQRCodeTextPDFTemplateRequest stockQRCodeTextPDFTemplateRequest,
|
||||||
|
HttpServletRequest request, HttpServletResponse response) throws Exception {
|
||||||
|
|
||||||
|
|
||||||
|
SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(3 + "");
|
||||||
|
if (systemPDFModuleEntity == null) return;
|
||||||
|
SystemPDFTemplateEntity systemPDFTemplateEntity =
|
||||||
|
systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId()));
|
||||||
|
if (systemPDFTemplateEntity == null) return;
|
||||||
|
|
||||||
|
StockPrintEntity stockPrintEntity = stockPrintService.selectById(stockQRCodeTextPDFTemplateRequest.getId());
|
||||||
|
Map<String, Object> data = new HashMap<String, Object>();
|
||||||
|
data.put("data", stockPrintEntity);
|
||||||
|
JasperUtils.jasperReport(request, response, data, systemPDFTemplateEntity.getPath(), "pdf");
|
||||||
|
stockPrintEntity.setPrintStatus("102");
|
||||||
|
stockPrintService.updateStockPrint(stockPrintEntity);
|
||||||
|
}
|
||||||
|
|
||||||
|
//-----------打印订单
|
||||||
|
@PostMapping("/udiwms/pdf/template/inspection/stock/order/file")
|
||||||
|
public BaseResponse inspectionStockOrderPDFFromTemplateFile(
|
||||||
|
@RequestBody InspectionPDFTemplateRequest inspectionPDFTemplateRequest) throws Exception {
|
||||||
|
|
||||||
|
StockOrderEntity stockOrderEntity =
|
||||||
|
stockOrderService.findById(inspectionPDFTemplateRequest.getOrderId());
|
||||||
|
if (stockOrderEntity == null) {
|
||||||
|
return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到该订单");
|
||||||
|
}
|
||||||
|
|
||||||
|
SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(2 + "");
|
||||||
|
if (systemPDFModuleEntity == null) return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误");
|
||||||
|
SystemPDFTemplateEntity systemPDFTemplateEntity =
|
||||||
|
systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId()));
|
||||||
|
if (systemPDFTemplateEntity == null) return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误");
|
||||||
|
|
||||||
|
return ResultVOUtils.success();
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/udiwms/pdf/template/stock/order/file")
|
||||||
|
public void stockOrderPDFFromTemplateFile(
|
||||||
|
@RequestBody StockQRCodeTextPDFTemplateRequest stockQRCodeTextPDFTemplateRequest,
|
||||||
|
HttpServletRequest request, HttpServletResponse response) throws Exception {
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
StockOrderEntity stockOrderEntity =
|
||||||
|
stockOrderService.findById(stockQRCodeTextPDFTemplateRequest.getId());
|
||||||
|
if (stockOrderEntity == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(2 + "");
|
||||||
|
if (systemPDFModuleEntity == null) return;
|
||||||
|
SystemPDFTemplateEntity systemPDFTemplateEntity =
|
||||||
|
systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId()));
|
||||||
|
if (systemPDFTemplateEntity == null) return;
|
||||||
|
stockQRCodeTextPDFTemplateRequest.setPath(systemPDFTemplateEntity.getPath());
|
||||||
|
stockQRCodeTextPDFTemplateRequest.setRowCount(systemPDFTemplateEntity.getRowCount());
|
||||||
|
stockQRCodeTextPDFTemplateRequest.setQrcodeCount(systemPDFTemplateEntity.getQrcodeCount());
|
||||||
|
//-----------------------------------------------
|
||||||
|
stockQRCodeTextPDFTemplateRequest.setOrderId(stockOrderEntity.getId());
|
||||||
|
|
||||||
|
stockQRCodeTextPDFTemplateRequest.setBillNo(stockOrderEntity.getBillNo());
|
||||||
|
|
||||||
|
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(stockOrderEntity.getBillType());
|
||||||
|
stockQRCodeTextPDFTemplateRequest.setActionName(bussinessTypeEntity == null ? " " : bussinessTypeEntity.getName());
|
||||||
|
|
||||||
|
StockOrderDetailFilterRequest stockOrderDetailFilterRequest = new StockOrderDetailFilterRequest();
|
||||||
|
stockOrderDetailFilterRequest.setOrderIdFk(stockOrderEntity.getId());
|
||||||
|
List<StockOrderDetailEntity> stockOrderDetailEntityList = stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest);
|
||||||
|
|
||||||
|
ITextPDFUtils.exportStockOrderPDFFromTemplateFile(
|
||||||
|
stockQRCodeTextPDFTemplateRequest, stockOrderEntity, stockOrderDetailEntityList, request, response);
|
||||||
|
*/
|
||||||
|
/*打印订单*/
|
||||||
|
List<StockOrderPrintEntity> list = stockOrderService.listOrderPrint(stockQRCodeTextPDFTemplateRequest.getId());
|
||||||
|
if (list != null && list.size() > 0) {
|
||||||
|
|
||||||
|
SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(2 + "");
|
||||||
|
if (systemPDFModuleEntity == null) return;
|
||||||
|
SystemPDFTemplateEntity systemPDFTemplateEntity =
|
||||||
|
systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId()));
|
||||||
|
if (systemPDFTemplateEntity == null) return;
|
||||||
|
Map<String, Object> data = new HashMap<String, Object>();
|
||||||
|
data.put("data", list);
|
||||||
|
JasperUtils.jasperReport(request, response, data, systemPDFTemplateEntity.getPath(), "pdf");
|
||||||
|
// JasperUtils.jasperReport(request, response, data, "jaspers/order_print_1.jasper", "pdf");
|
||||||
|
StockOrderEntity updateStockOrderEntity = new StockOrderEntity();
|
||||||
|
updateStockOrderEntity.setId(stockQRCodeTextPDFTemplateRequest.getId());
|
||||||
|
updateStockOrderEntity.setPrintStatus("102");
|
||||||
|
stockOrderService.updateById(updateStockOrderEntity);
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@GetMapping(value = "/udiwms/stock/qrcode/text/upload")
|
||||||
|
public BaseResponse upload(StockQRCodeTextFilterRequest stockQRCodeTextFilterRequest,
|
||||||
|
BindingResult bindingResult) {
|
||||||
|
if (bindingResult.hasErrors()) {
|
||||||
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||||
|
}
|
||||||
|
StockQRCodeTextEntity stockQRCodeTextEntity = new StockQRCodeTextEntity();
|
||||||
|
BeanUtils.copyProperties(stockQRCodeTextFilterRequest, stockQRCodeTextEntity);
|
||||||
|
boolean b = stockQRCodeTextService.updateById(stockQRCodeTextEntity);
|
||||||
|
if (b) {
|
||||||
|
return ResultVOUtils.success();
|
||||||
|
}
|
||||||
|
return ResultVOUtils.error(500, "修改失败");
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/udiwms/stock/qrcode/text/delete")
|
||||||
|
public BaseResponse delete(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
|
||||||
|
|
||||||
|
if (bindingResult.hasErrors()) {
|
||||||
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||||
|
}
|
||||||
|
boolean b = stockQRCodeTextService.deleteById(deleteRequest.getId());
|
||||||
|
if (b) {
|
||||||
|
return ResultVOUtils.success("删除成功");
|
||||||
|
} else {
|
||||||
|
return ResultVOUtils.error(500, "删除失败");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,22 @@
|
|||||||
|
package com.glxp.api.admin.dao.auth;
|
||||||
|
|
||||||
|
import com.glxp.api.admin.entity.auth.AuthAdmin;
|
||||||
|
import com.glxp.api.admin.entity.auth.AuthCheckEntity;
|
||||||
|
import com.glxp.api.admin.req.auth.AuthCheckRequest;
|
||||||
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Mapper
|
||||||
|
public interface AuthCheckDao {
|
||||||
|
|
||||||
|
List<AuthCheckEntity> filterDevices(AuthCheckRequest authCheckRequest);
|
||||||
|
|
||||||
|
AuthCheckEntity findByMachine(String machineInfo);
|
||||||
|
|
||||||
|
boolean insertDevices(AuthCheckEntity authCheckEntity);
|
||||||
|
|
||||||
|
boolean updateDevices(AuthCheckEntity authCheckEntity);
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,13 @@
|
|||||||
|
package com.glxp.api.admin.dao.basic;
|
||||||
|
|
||||||
|
import com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity;
|
||||||
|
import com.glxp.api.admin.req.basic.BussinessOriginTypeFilterRequest;
|
||||||
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Mapper
|
||||||
|
public interface BussinessOriginTypeDao {
|
||||||
|
|
||||||
|
List<BussinessOriginTypeEntity> filterList(BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest);
|
||||||
|
}
|
||||||
@ -0,0 +1,26 @@
|
|||||||
|
package com.glxp.api.admin.dao.business;
|
||||||
|
|
||||||
|
import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
|
||||||
|
import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest;
|
||||||
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Mapper
|
||||||
|
public interface StockOrderDetailTempDao {
|
||||||
|
|
||||||
|
List<StockOrderDetailEntity> filterStockOrderDetailTemp(StockOrderDetailFilterRequest stockOrderDetailFilterRequest);
|
||||||
|
|
||||||
|
boolean insertStockOrderDetailTemp(StockOrderDetailEntity stockOrderDetailEntity);
|
||||||
|
|
||||||
|
boolean insertStockOrderDetailTemps(@Param("stockOrderDetailEntities") List<StockOrderDetailEntity> stockOrderDetailEntities);
|
||||||
|
|
||||||
|
boolean updateById(StockOrderDetailEntity stockOrderDetailEntity);
|
||||||
|
|
||||||
|
boolean deleteById(@Param("id") String id);
|
||||||
|
|
||||||
|
boolean deleteByOrderIdFk(@Param("id") String id);
|
||||||
|
|
||||||
|
StockOrderDetailEntity findOne(@Param("id") String id);
|
||||||
|
}
|
||||||
@ -0,0 +1,26 @@
|
|||||||
|
package com.glxp.api.admin.dao.business;
|
||||||
|
|
||||||
|
import com.glxp.api.admin.entity.business.StockQRCodeTextEntity;
|
||||||
|
import com.glxp.api.admin.req.business.StockQRCodeTextFilterRequest;
|
||||||
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Mapper
|
||||||
|
public interface StockQRCodeTextDao {
|
||||||
|
|
||||||
|
List<StockQRCodeTextEntity> filterStockQRCodeText(StockQRCodeTextFilterRequest stockQRCodeTextFilterRequest);
|
||||||
|
|
||||||
|
boolean insertStockQRCodeText(StockQRCodeTextEntity stockQRCodeTextEntity);
|
||||||
|
|
||||||
|
boolean insertStockQRCodeTexts(@Param("StockQRCodeTextEntities") List<StockQRCodeTextEntity> StockQRCodeTextEntitys);
|
||||||
|
|
||||||
|
boolean updateById(StockQRCodeTextEntity stockQRCodeTextEntity);
|
||||||
|
|
||||||
|
boolean deleteById(@Param("id") String id);
|
||||||
|
|
||||||
|
boolean deleteByOrderId(@Param("id") String id);
|
||||||
|
|
||||||
|
StockQRCodeTextEntity findOne(@Param("id") String id);
|
||||||
|
}
|
||||||
@ -0,0 +1,14 @@
|
|||||||
|
package com.glxp.api.admin.entity.auth;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class AuthCheckEntity {
|
||||||
|
private Integer id;
|
||||||
|
private String machineInfo;
|
||||||
|
private String remark;
|
||||||
|
private String registerCode;
|
||||||
|
private Date createDate;
|
||||||
|
}
|
||||||
@ -0,0 +1,11 @@
|
|||||||
|
package com.glxp.api.admin.entity.basic;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class BussinessOriginTypeEntity {
|
||||||
|
private String id;
|
||||||
|
private String name;
|
||||||
|
private String action;
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,23 @@
|
|||||||
|
package com.glxp.api.admin.entity.business;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class StockOrderPrintEntity extends StockOrderDetailEntity {
|
||||||
|
|
||||||
|
private String id;
|
||||||
|
private String billNo;
|
||||||
|
private String billdate;
|
||||||
|
private String corpId;
|
||||||
|
private String corpName;
|
||||||
|
private String billType;
|
||||||
|
private String billFlag;
|
||||||
|
private String thirdSysFk;
|
||||||
|
private String status;
|
||||||
|
private String statusInfo;
|
||||||
|
private String type;
|
||||||
|
private String sourceType;
|
||||||
|
private String printStatus;
|
||||||
|
private String unitIdFk;
|
||||||
|
private String customerId;
|
||||||
|
}
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.glxp.api.admin.entity.inout;
|
package com.glxp.api.admin.entity.business;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@ -0,0 +1,262 @@
|
|||||||
|
package com.glxp.api.admin.entity.inventory;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
|
public class StockPrinttREntity {
|
||||||
|
|
||||||
|
private int id;
|
||||||
|
private String udiRlIdFk;
|
||||||
|
private String udiCode;
|
||||||
|
private String nameCode;
|
||||||
|
private String cpmctymc;
|
||||||
|
private String batchNo;
|
||||||
|
private String produceDate;
|
||||||
|
private String expireDate;
|
||||||
|
private String serialNo;
|
||||||
|
private String codeType;
|
||||||
|
private String thirdId;
|
||||||
|
private String thirdName;
|
||||||
|
private String printStatus;
|
||||||
|
private String ggxh;
|
||||||
|
private String ylqxzcrbarmc;
|
||||||
|
private String zczbhhzbapzbh;
|
||||||
|
private String warehouseName;
|
||||||
|
private String warehouseCode;
|
||||||
|
private String spaceCode;
|
||||||
|
private String spaceName;
|
||||||
|
private String thirdSysFk;
|
||||||
|
private String nnum;
|
||||||
|
private String genKeyFk;
|
||||||
|
|
||||||
|
private String sOrderId;
|
||||||
|
private String sDetailId;
|
||||||
|
private Date updateTime;
|
||||||
|
|
||||||
|
|
||||||
|
public int getId() {
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setId(int id) {
|
||||||
|
this.id = id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getUdiRlIdFk() {
|
||||||
|
return udiRlIdFk;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setUdiRlIdFk(String udiRlIdFk) {
|
||||||
|
this.udiRlIdFk = udiRlIdFk;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getUdiCode() {
|
||||||
|
return udiCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setUdiCode(String udiCode) {
|
||||||
|
this.udiCode = udiCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getNameCode() {
|
||||||
|
return nameCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setNameCode(String nameCode) {
|
||||||
|
this.nameCode = nameCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getCpmctymc() {
|
||||||
|
return cpmctymc;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCpmctymc(String cpmctymc) {
|
||||||
|
this.cpmctymc = cpmctymc;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getBatchNo() {
|
||||||
|
if(batchNo==null){
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
return batchNo;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setBatchNo(String batchNo) {
|
||||||
|
this.batchNo = batchNo;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getProduceDate() {
|
||||||
|
if(produceDate==null){
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
return produceDate;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setProduceDate(String produceDate) {
|
||||||
|
|
||||||
|
this.produceDate = produceDate;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getExpireDate() {
|
||||||
|
if(expireDate==null){
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
return expireDate;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setExpireDate(String expireDate) {
|
||||||
|
this.expireDate = expireDate;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getSerialNo() {
|
||||||
|
if(serialNo==null){
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
return serialNo;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSerialNo(String serialNo) {
|
||||||
|
this.serialNo = serialNo;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getCodeType() {
|
||||||
|
return codeType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCodeType(String codeType) {
|
||||||
|
this.codeType = codeType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getThirdId() {
|
||||||
|
return thirdId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setThirdId(String thirdId) {
|
||||||
|
this.thirdId = thirdId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getThirdName() {
|
||||||
|
return thirdName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setThirdName(String thirdName) {
|
||||||
|
this.thirdName = thirdName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getPrintStatus() {
|
||||||
|
return printStatus;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPrintStatus(String printStatus) {
|
||||||
|
this.printStatus = printStatus;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getGgxh() {
|
||||||
|
return ggxh;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setGgxh(String ggxh) {
|
||||||
|
this.ggxh = ggxh;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getYlqxzcrbarmc() {
|
||||||
|
return ylqxzcrbarmc;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setYlqxzcrbarmc(String ylqxzcrbarmc) {
|
||||||
|
this.ylqxzcrbarmc = ylqxzcrbarmc;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getZczbhhzbapzbh() {
|
||||||
|
return zczbhhzbapzbh;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setZczbhhzbapzbh(String zczbhhzbapzbh) {
|
||||||
|
this.zczbhhzbapzbh = zczbhhzbapzbh;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getWarehouseName() {
|
||||||
|
return warehouseName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setWarehouseName(String warehouseName) {
|
||||||
|
this.warehouseName = warehouseName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getWarehouseCode() {
|
||||||
|
if(warehouseCode==null){
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
return warehouseCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setWarehouseCode(String warehouseCode) {
|
||||||
|
this.warehouseCode = warehouseCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getSpaceCode() {
|
||||||
|
if(spaceCode==null){
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
return spaceCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSpaceCode(String spaceCode) {
|
||||||
|
this.spaceCode = spaceCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getSpaceName() {
|
||||||
|
return spaceName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSpaceName(String spaceName) {
|
||||||
|
this.spaceName = spaceName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getThirdSysFk() {
|
||||||
|
return thirdSysFk;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setThirdSysFk(String thirdSysFk) {
|
||||||
|
this.thirdSysFk = thirdSysFk;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getNnum() {
|
||||||
|
return nnum;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setNnum(String nnum) {
|
||||||
|
this.nnum = nnum;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getGenKeyFk() {
|
||||||
|
return genKeyFk;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setGenKeyFk(String genKeyFk) {
|
||||||
|
this.genKeyFk = genKeyFk;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getsOrderId() {
|
||||||
|
return sOrderId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setsOrderId(String sOrderId) {
|
||||||
|
this.sOrderId = sOrderId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getsDetailId() {
|
||||||
|
return sDetailId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setsDetailId(String sDetailId) {
|
||||||
|
this.sDetailId = sDetailId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Date getUpdateTime() {
|
||||||
|
return updateTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setUpdateTime(Date updateTime) {
|
||||||
|
this.updateTime = updateTime;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,13 @@
|
|||||||
|
package com.glxp.api.admin.req.auth;
|
||||||
|
|
||||||
|
import com.glxp.api.admin.req.ListPageRequest;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class AuthCheckRequest extends ListPageRequest {
|
||||||
|
|
||||||
|
private Integer id;
|
||||||
|
private String machineInfo;
|
||||||
|
private String registerCode;
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,19 @@
|
|||||||
|
package com.glxp.api.admin.req.auth;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import javax.validation.constraints.NotEmpty;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class PCLoginRequest {
|
||||||
|
|
||||||
|
@NotEmpty(message = "用户名不能为空")
|
||||||
|
private String username;
|
||||||
|
|
||||||
|
@NotEmpty(message = "密码不能为空")
|
||||||
|
private String password;
|
||||||
|
|
||||||
|
@NotEmpty(message = "机器码不能为空")
|
||||||
|
private String machineInfo;
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,10 @@
|
|||||||
|
package com.glxp.api.admin.req.basic;
|
||||||
|
|
||||||
|
import com.glxp.api.admin.req.ListPageRequest;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class BussinessOriginTypeFilterRequest extends ListPageRequest {
|
||||||
|
private String action;
|
||||||
|
private String name;
|
||||||
|
}
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.glxp.api.admin.req.inout;
|
package com.glxp.api.admin.req.business;
|
||||||
|
|
||||||
import com.glxp.api.admin.req.ListPageRequest;
|
import com.glxp.api.admin.req.ListPageRequest;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@ -0,0 +1,21 @@
|
|||||||
|
package com.glxp.api.admin.req.business;
|
||||||
|
|
||||||
|
import com.glxp.api.admin.req.ListPageRequest;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class StockQRCodeTextFilterRequest extends ListPageRequest {
|
||||||
|
|
||||||
|
private String id;
|
||||||
|
private String orderId;
|
||||||
|
private String detailId;
|
||||||
|
private String text;
|
||||||
|
private String textTag;
|
||||||
|
private String status;
|
||||||
|
private String param;
|
||||||
|
private Date create_time;
|
||||||
|
private Date update_time;
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,23 @@
|
|||||||
|
package com.glxp.api.admin.res.business;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class StockOrderDetailResponse {
|
||||||
|
|
||||||
|
private String id;
|
||||||
|
private String orderIdFk;
|
||||||
|
private String productId;
|
||||||
|
private String productName;
|
||||||
|
private String cpmctymc;
|
||||||
|
private String spec;
|
||||||
|
private String ggxh;
|
||||||
|
private String batchNo;
|
||||||
|
private String expireDate;
|
||||||
|
private String productDate;
|
||||||
|
private String count;
|
||||||
|
private String reCount;
|
||||||
|
private String sweepCount;
|
||||||
|
private String ylqxzcrbarmc;
|
||||||
|
private String zczbhhzbapzbh;
|
||||||
|
}
|
||||||
@ -0,0 +1,18 @@
|
|||||||
|
package com.glxp.api.admin.service.auth;
|
||||||
|
|
||||||
|
import com.glxp.api.admin.entity.auth.AuthCheckEntity;
|
||||||
|
import com.glxp.api.admin.req.auth.AuthCheckRequest;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public interface AuthCheckService {
|
||||||
|
|
||||||
|
AuthCheckEntity findByMachine(String machineInfo);
|
||||||
|
|
||||||
|
List<AuthCheckEntity> filterDevices(AuthCheckRequest authCheckRequest);
|
||||||
|
|
||||||
|
boolean insertDevices(AuthCheckEntity authCheckEntity);
|
||||||
|
|
||||||
|
boolean updateDevices(AuthCheckEntity authCheckEntity);
|
||||||
|
}
|
||||||
@ -0,0 +1,46 @@
|
|||||||
|
package com.glxp.api.admin.service.auth.impl;
|
||||||
|
|
||||||
|
import com.github.pagehelper.PageHelper;
|
||||||
|
import com.glxp.api.admin.dao.auth.AuthAdminDao;
|
||||||
|
import com.glxp.api.admin.dao.auth.AuthCheckDao;
|
||||||
|
import com.glxp.api.admin.entity.auth.AuthCheckEntity;
|
||||||
|
import com.glxp.api.admin.req.auth.AuthCheckRequest;
|
||||||
|
import com.glxp.api.admin.service.auth.AuthCheckService;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
public class AuthCheckServiceImpl implements AuthCheckService {
|
||||||
|
@Resource
|
||||||
|
private AuthCheckDao authCheckDao;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public AuthCheckEntity findByMachine(String machineInfo) {
|
||||||
|
return authCheckDao.findByMachine(machineInfo);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<AuthCheckEntity> filterDevices(AuthCheckRequest authCheckRequest) {
|
||||||
|
if (authCheckRequest == null) {
|
||||||
|
return Collections.emptyList();
|
||||||
|
}
|
||||||
|
if (authCheckRequest.getPage() != null) {
|
||||||
|
int offset = (authCheckRequest.getPage() - 1) * authCheckRequest.getLimit();
|
||||||
|
PageHelper.offsetPage(offset, authCheckRequest.getLimit());
|
||||||
|
}
|
||||||
|
return authCheckDao.filterDevices(authCheckRequest);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean insertDevices(AuthCheckEntity authCheckEntity) {
|
||||||
|
return authCheckDao.insertDevices(authCheckEntity);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean updateDevices(AuthCheckEntity authCheckEntity) {
|
||||||
|
return authCheckDao.updateDevices(authCheckEntity);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,13 @@
|
|||||||
|
package com.glxp.api.admin.service.basic;
|
||||||
|
|
||||||
|
|
||||||
|
import com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity;
|
||||||
|
import com.glxp.api.admin.req.basic.BussinessOriginTypeFilterRequest;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public interface BussinessOriginTypeService {
|
||||||
|
|
||||||
|
List<BussinessOriginTypeEntity> filterList(BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest);
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,31 @@
|
|||||||
|
package com.glxp.api.admin.service.basic;
|
||||||
|
|
||||||
|
import com.glxp.api.admin.entity.inout.WarehouseEntity;
|
||||||
|
import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
public class CustomService {
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
UdiRelevanceService udiRelevanceService;
|
||||||
|
|
||||||
|
public int getActCount(WarehouseEntity warehouseEntity) {
|
||||||
|
UdiRelevanceResponse udiInfoBean = udiRelevanceService.selectByNameCode(warehouseEntity.getNameCode());
|
||||||
|
if (udiInfoBean != null) {
|
||||||
|
if (udiInfoBean.getIsUseDy() == 1 && udiInfoBean.getDiType() != 2) {
|
||||||
|
if (udiInfoBean.getBhzxxsbzsl() == 0)
|
||||||
|
return udiInfoBean.getZxxsbzbhsydysl();
|
||||||
|
else
|
||||||
|
return udiInfoBean.getZxxsbzbhsydysl() * udiInfoBean.getBhzxxsbzsl();
|
||||||
|
} else {
|
||||||
|
return udiInfoBean.getBhzxxsbzsl();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,32 @@
|
|||||||
|
package com.glxp.api.admin.service.basic.impl;
|
||||||
|
|
||||||
|
import com.github.pagehelper.PageHelper;
|
||||||
|
import com.glxp.api.admin.dao.basic.BussinessOriginTypeDao;
|
||||||
|
import com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity;
|
||||||
|
import com.glxp.api.admin.req.basic.BussinessOriginTypeFilterRequest;
|
||||||
|
import com.glxp.api.admin.service.basic.BussinessOriginTypeService;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
public class BussinessOriginTypeServiceImpl implements BussinessOriginTypeService {
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
BussinessOriginTypeDao bussinessOriginTypeDao;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<BussinessOriginTypeEntity> filterList(BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest) {
|
||||||
|
if (bussinessOriginTypeFilterRequest == null) {
|
||||||
|
return Collections.emptyList();
|
||||||
|
}
|
||||||
|
if (bussinessOriginTypeFilterRequest.getPage() != null) {
|
||||||
|
int offset = (bussinessOriginTypeFilterRequest.getPage() - 1) * bussinessOriginTypeFilterRequest.getLimit();
|
||||||
|
PageHelper.offsetPage(offset, bussinessOriginTypeFilterRequest.getLimit());
|
||||||
|
}
|
||||||
|
List<BussinessOriginTypeEntity> data = bussinessOriginTypeDao.filterList(bussinessOriginTypeFilterRequest);
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,24 @@
|
|||||||
|
package com.glxp.api.admin.service.business;
|
||||||
|
|
||||||
|
import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
|
||||||
|
import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest;
|
||||||
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public interface StockOrderDetailTempService {
|
||||||
|
|
||||||
|
List<StockOrderDetailEntity> filterStockOrderDetailTemp(StockOrderDetailFilterRequest stockOrderDetailFilterRequest);
|
||||||
|
|
||||||
|
boolean insertStockOrderDetailTemp(StockOrderDetailEntity stockOrderDetailEntity);
|
||||||
|
|
||||||
|
boolean insertStockOrderDetailTemps(List<StockOrderDetailEntity> stockOrderDetailEntities);
|
||||||
|
|
||||||
|
boolean updateById(StockOrderDetailEntity stockOrderDetailEntity);
|
||||||
|
|
||||||
|
boolean deleteById(String id);
|
||||||
|
|
||||||
|
boolean deleteByOrderIdFk(String id);
|
||||||
|
|
||||||
|
StockOrderDetailEntity findOne(@Param("id") String id);
|
||||||
|
}
|
||||||
@ -0,0 +1,24 @@
|
|||||||
|
package com.glxp.api.admin.service.business;
|
||||||
|
|
||||||
|
import com.glxp.api.admin.entity.business.StockQRCodeTextEntity;
|
||||||
|
import com.glxp.api.admin.req.business.StockQRCodeTextFilterRequest;
|
||||||
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public interface StockQRCodeTextService {
|
||||||
|
|
||||||
|
List<StockQRCodeTextEntity> filterStockQRCodeText(StockQRCodeTextFilterRequest stockQRCodeTextFilterRequest);
|
||||||
|
|
||||||
|
boolean insertStockQRCodeText(StockQRCodeTextEntity stockQRCodeTextEntity);
|
||||||
|
|
||||||
|
boolean insertStockQRCodeTexts(@Param("StockQRCodeTextEntities") List<StockQRCodeTextEntity> StockQRCodeTextEntitys);
|
||||||
|
|
||||||
|
boolean updateById(StockQRCodeTextEntity stockQRCodeTextEntity);
|
||||||
|
|
||||||
|
boolean deleteById(@Param("id") String id);
|
||||||
|
|
||||||
|
boolean deleteByOrderId(@Param("id") String id);
|
||||||
|
|
||||||
|
StockQRCodeTextEntity findOne(@Param("id") String id);
|
||||||
|
}
|
||||||
@ -0,0 +1,61 @@
|
|||||||
|
package com.glxp.api.admin.service.business.impl;
|
||||||
|
|
||||||
|
import com.github.pagehelper.PageHelper;
|
||||||
|
import com.glxp.api.admin.dao.business.StockOrderDetailTempDao;
|
||||||
|
import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
|
||||||
|
import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest;
|
||||||
|
import com.glxp.api.admin.service.business.StockOrderDetailTempService;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
public class StockOrderDetailTempServiceImpl implements StockOrderDetailTempService {
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
StockOrderDetailTempDao stockOrderDetailTempDao;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<StockOrderDetailEntity> filterStockOrderDetailTemp(StockOrderDetailFilterRequest stockOrderDetailFilterRequest) {
|
||||||
|
if (stockOrderDetailFilterRequest == null) {
|
||||||
|
return Collections.emptyList();
|
||||||
|
}
|
||||||
|
if (stockOrderDetailFilterRequest.getPage() != null) {
|
||||||
|
int offset = (stockOrderDetailFilterRequest.getPage() - 1) * stockOrderDetailFilterRequest.getLimit();
|
||||||
|
PageHelper.offsetPage(offset, stockOrderDetailFilterRequest.getLimit());
|
||||||
|
}
|
||||||
|
return stockOrderDetailTempDao.filterStockOrderDetailTemp(stockOrderDetailFilterRequest);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean insertStockOrderDetailTemp(StockOrderDetailEntity stockOrderDetailEntity) {
|
||||||
|
return stockOrderDetailTempDao.insertStockOrderDetailTemp(stockOrderDetailEntity);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean insertStockOrderDetailTemps(List<StockOrderDetailEntity> StockOrderDetailEntitys) {
|
||||||
|
return stockOrderDetailTempDao.insertStockOrderDetailTemps(StockOrderDetailEntitys);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean updateById(StockOrderDetailEntity stockOrderDetailEntity) {
|
||||||
|
return stockOrderDetailTempDao.updateById(stockOrderDetailEntity);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean deleteById(String id) {
|
||||||
|
return stockOrderDetailTempDao.deleteById(id);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public boolean deleteByOrderIdFk(String id) {
|
||||||
|
return stockOrderDetailTempDao.deleteByOrderIdFk(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public StockOrderDetailEntity findOne(String id) {
|
||||||
|
return stockOrderDetailTempDao.findOne(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,61 @@
|
|||||||
|
package com.glxp.api.admin.service.business.impl;
|
||||||
|
|
||||||
|
import com.github.pagehelper.PageHelper;
|
||||||
|
import com.glxp.api.admin.dao.business.StockQRCodeTextDao;
|
||||||
|
import com.glxp.api.admin.entity.business.StockQRCodeTextEntity;
|
||||||
|
import com.glxp.api.admin.req.business.StockQRCodeTextFilterRequest;
|
||||||
|
import com.glxp.api.admin.service.business.StockQRCodeTextService;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
public class StockQRCodeTextServiceImpl implements StockQRCodeTextService {
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
StockQRCodeTextDao stockQRCodeTextDao;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<StockQRCodeTextEntity> filterStockQRCodeText(StockQRCodeTextFilterRequest stockQRCodeTextFilterRequest) {
|
||||||
|
if (stockQRCodeTextFilterRequest == null) {
|
||||||
|
return Collections.emptyList();
|
||||||
|
}
|
||||||
|
if (stockQRCodeTextFilterRequest.getPage() != null) {
|
||||||
|
int offset = (stockQRCodeTextFilterRequest.getPage() - 1) * stockQRCodeTextFilterRequest.getLimit();
|
||||||
|
PageHelper.offsetPage(offset, stockQRCodeTextFilterRequest.getLimit());
|
||||||
|
}
|
||||||
|
return stockQRCodeTextDao.filterStockQRCodeText(stockQRCodeTextFilterRequest);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean insertStockQRCodeText(StockQRCodeTextEntity stockQRCodeTextEntity) {
|
||||||
|
return stockQRCodeTextDao.insertStockQRCodeText(stockQRCodeTextEntity);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean insertStockQRCodeTexts(List<StockQRCodeTextEntity> StockQRCodeTextEntitys) {
|
||||||
|
return stockQRCodeTextDao.insertStockQRCodeTexts(StockQRCodeTextEntitys);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean updateById(StockQRCodeTextEntity stockQRCodeTextEntity) {
|
||||||
|
return stockQRCodeTextDao.updateById(stockQRCodeTextEntity);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean deleteById(String id) {
|
||||||
|
return stockQRCodeTextDao.deleteById(id);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public boolean deleteByOrderId(String id) {
|
||||||
|
return stockQRCodeTextDao.deleteByOrderId(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public StockQRCodeTextEntity findOne(String id) {
|
||||||
|
return stockQRCodeTextDao.findOne(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue