diff --git a/api-admin/pom.xml b/api-admin/pom.xml index 26915f1..e686ca6 100644 --- a/api-admin/pom.xml +++ b/api-admin/pom.xml @@ -151,7 +151,11 @@ hutool-all 5.7.9 - + + com.belerweb + pinyin4j + 2.5.0 + com.google.zxing diff --git a/api-admin/src/main/java/com/glxp/sale/admin/config/PageHelperConfig.java b/api-admin/src/main/java/com/glxp/sale/admin/config/PageHelperConfig.java index 41e5bc7..2b43407 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/config/PageHelperConfig.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/config/PageHelperConfig.java @@ -3,6 +3,8 @@ package com.glxp.sale.admin.config; import com.github.pagehelper.PageHelper; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.annotation.AsyncAnnotationBeanPostProcessor; +import org.springframework.scheduling.config.TaskManagementConfigUtils; import java.util.Properties; @@ -26,4 +28,20 @@ public class PageHelperConfig { return pageHelper; } + +// /** +// * 线程异常时打印 +// * +// * @return +// */ +// @Bean(name = TaskManagementConfigUtils.ASYNC_ANNOTATION_PROCESSOR_BEAN_NAME) +// public AsyncAnnotationBeanPostProcessor myAsyncAdvisor() { +// AsyncAnnotationBeanPostProcessor asyncAdvisor = new AsyncAnnotationBeanPostProcessor(); +// asyncAdvisor.setExceptionHandler((ex, method, params) -> { +// System.out.println(ex); +// }); +// return asyncAdvisor; +// } + + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/constant/Constant.java b/api-admin/src/main/java/com/glxp/sale/admin/constant/Constant.java new file mode 100644 index 0000000..245fa01 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/constant/Constant.java @@ -0,0 +1,6 @@ +package com.glxp.sale.admin.constant; + +public class Constant { + + public static String SYSTEM_CUSTOMER_ID = "110"; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/CustomerController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/CustomerController.java index 5c9b871..0865ba6 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/CustomerController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/CustomerController.java @@ -55,6 +55,18 @@ public class CustomerController { @Resource private SystemPDFTemplateRelevanceService systemPDFTemplateRelevanceService; + @GetMapping("/spms/customer/list") + public BaseResponse filterCustomers(CustomerInfoFilterRequest customerFilterRequest) { + + List customerDetailEntities = customerInfoService.filterCustomerInfo(customerFilterRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(customerDetailEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(customerDetailEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + @GetMapping("salewarehouse/customer/list") public BaseResponse filterList(CustomerInfoFilterRequest customerFilterRequest) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java index 8dedfda..b541ff4 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.controller.auth; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; +import com.glxp.sale.admin.constant.Constant; import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.info.CompanyEntity; import com.glxp.sale.admin.exception.JsonException; @@ -60,7 +61,7 @@ public class LoginController { } AuthAdmin authAdmin; if (loginRequest.getType() != null && loginRequest.getType() == 1) { - authAdmin = authAdminService.findByUser(loginRequest.getUsername(), "110"); + authAdmin = authAdminService.findByUser(loginRequest.getUsername(), Constant.SYSTEM_CUSTOMER_ID); } else authAdmin = authAdminService.findByUserName(loginRequest.getUsername()); if (authAdmin == null) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java index a52da55..471fd58 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java @@ -198,26 +198,26 @@ public class RegisterController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } log.info(httpSession.getId()); - JSONObject userCode = (JSONObject) httpSession.getAttribute("code"); - if (userCode == null) { - return ResultVOUtils.error(500, "验证码已失效，请重新获取"); - } - long lastTime = userCode.getLong("createTime"); - int checkCode = (Integer) userCode.get("code"); - String phoneNum = userCode.getString("memPhone"); - if ((System.currentTimeMillis() - lastTime) > 1000 * 60 * 5) { - return ResultVOUtils.error(500, "验证码已过期，请重新获取"); - } - if (checkCode != userRegisterEntity.getCheckCode()) { - return ResultVOUtils.error(500, "验证码错误，请重新获取"); - } - if (!phoneNum.equals(userRegisterEntity.getMobile())) { - return ResultVOUtils.error(500, "手机号与获取验证码不一致"); - } - boolean isExitPhone = userRegisterService.isExit(userRegisterEntity.getMobile()); - if (isExitPhone) { - return ResultVOUtils.error(500, "该手机号已被注册"); - } +// JSONObject userCode = (JSONObject) httpSession.getAttribute("code"); +// if (userCode == null) { +// return ResultVOUtils.error(500, "验证码已失效，请重新获取"); +// } +// long lastTime = userCode.getLong("createTime"); +// int checkCode = (Integer) userCode.get("code"); +// String phoneNum = userCode.getString("memPhone"); +// if ((System.currentTimeMillis() - lastTime) > 1000 * 60 * 5) { +// return ResultVOUtils.error(500, "验证码已过期，请重新获取"); +// } +// if (checkCode != userRegisterEntity.getCheckCode()) { +// return ResultVOUtils.error(500, "验证码错误，请重新获取"); +// } +// if (!phoneNum.equals(userRegisterEntity.getMobile())) { +// return ResultVOUtils.error(500, "手机号与获取验证码不一致"); +// } +// boolean isExitPhone = userRegisterService.isExit(userRegisterEntity.getMobile()); +// if (isExitPhone) { +// return ResultVOUtils.error(500, "该手机号已被注册"); +// } userRegisterEntity.setRegisterTime(DateUtil.getDateTime()); userRegisterEntity.setCheckType(0);//未审核 diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessOriginTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessOriginTypeController.java new file mode 100644 index 0000000..fd06ea6 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessOriginTypeController.java @@ -0,0 +1,47 @@ +package com.glxp.sale.admin.controller.basic; + +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity; +import com.glxp.sale.admin.entity.basic.BussinessOriginTypeEntity; +import com.glxp.sale.admin.req.basic.BussinessLocalTypeFilterRequest; +import com.glxp.sale.admin.req.basic.BussinessOriginTypeFilterRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.service.basic.BussinessLocalTypeService; +import com.glxp.sale.admin.service.basic.BussinessOriginTypeService; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.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 bussinessTypeEntities; + bussinessTypeEntities = bussinessOriginTypeService.filterList( + bussinessTypeFilterRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(bussinessTypeEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(bussinessTypeEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java index ef86139..92ecd49 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java @@ -635,6 +635,29 @@ public class UdiRelevanceController { return ResultVOUtils.success("解除绑定成功！"); } + //获取是否启用供应商维护产品信息 + @GetMapping("/udiwms/udiinfo/spcombie") + public BaseResponse getSBCombie() { + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("sp_combie_products"); + return ResultVOUtils.success(systemParamConfigEntity); + } + + @PostMapping("/udiwms/udirl/lock/status") + public BaseResponse uploadThirdServcie(@RequestBody LockUdiRequest lockUdiRequest) { + if (lockUdiRequest.getLockStatus() != null && lockUdiRequest.getIds().size() > 0) { + for (String id : lockUdiRequest.getIds()) { + UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); + udiRelevanceEntity.setId(id); + udiRelevanceEntity.setLockStatus(lockUdiRequest.getLockStatus()); + udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); + } + return ResultVOUtils.success("更新成功！"); + } else { + return ResultVOUtils.error(500,"参数错误！！"); + } + + } + public UdiRelevanceEntity setThird(CombineRequest combineRequest, UdiRelevanceEntity udiRelevanceEntity) { if ("thirdId".equals(combineRequest.getThirdSys())) { udiRelevanceEntity.setThirdId(combineRequest.getThirdId()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java index c6e4956..f1b7262 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.controller.inout; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.constant.Constant; import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.controller.inout.utils.ContrastErpUtil; import com.glxp.sale.admin.controller.inout.utils.DataTransUtil; @@ -90,7 +91,7 @@ public class OrderController { // orderFilterRequest.setStatusOrOne(ConstantStatus.ORDER_STATUS_TEMP_SAVE); if (StringUtils.isBlank(orderFilterRequest.getCustomerId())) return ResultVOUtils.success(); - if (orderFilterRequest.getCustomerId().equals("110")) + if (orderFilterRequest.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) orderFilterRequest.setCustomerId(null); // List orderEntityList = orderService.filterListOr(orderFilterRequest); List orderEntityList = orderService.filterList(orderFilterRequest); @@ -151,7 +152,7 @@ public class OrderController { BindingResult bindingResult) { if (StringUtils.isBlank(orderFilterRequest.getCustomerId())) return ResultVOUtils.success(); - if (orderFilterRequest.getCustomerId().equals("110")) orderFilterRequest.setCustomerId(null); + if (orderFilterRequest.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) orderFilterRequest.setCustomerId(null); if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java index 8ca5543..7c158be 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java @@ -8,6 +8,9 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.glxp.sale.admin.entity.basic.StockPrintEntity; +import com.glxp.sale.admin.req.basic.FilterStockprintRequest; +import com.glxp.sale.admin.service.inventory.InvStockPrintService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.BindingResult; @@ -66,7 +69,8 @@ public class StockQRCodeTextController { private SystemPDFModuleService systemPDFModuleService; @Resource private BussinessTypeService bussinessTypeService; - + @Resource + InvStockPrintService stockPrintService; @Resource private IoTransInoutService transInoutService; @@ -105,49 +109,38 @@ public class StockQRCodeTextController { public BaseResponse inspectionStockQRCodeTextPDFFromTemplateFile( @RequestBody InspectionPDFTemplateRequest inspectionPDFTemplateRequest) throws Exception { - StockQRCodeTextEntity stockQRCodeTextEntity = - stockQRCodeTextService.findOne(inspectionPDFTemplateRequest.getQueryId()); - if (stockQRCodeTextEntity == null) { + 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 { - - - StockQRCodeTextEntity stockQRCodeTextEntity = stockQRCodeTextService.findOne(stockQRCodeTextPDFTemplateRequest.getId()); - if (stockQRCodeTextEntity == null) { - return; - } SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(3 + ""); if (systemPDFModuleEntity == null) return; SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId())); if (systemPDFTemplateEntity == null) return; - stockQRCodeTextPDFTemplateRequest.setPath(systemPDFTemplateEntity.getPath()); - //----------------------------------------------- - stockQRCodeTextPDFTemplateRequest.setOrderId(stockQRCodeTextEntity.getOrderId()); - stockQRCodeTextPDFTemplateRequest.setDetailId(stockQRCodeTextEntity.getDetailId()); - - ITextPDFUtils.exportStockQRCodeTextPDFFromTemplateFile( - stockQRCodeTextPDFTemplateRequest, request, response); - StockOrderEntity updateStockOrderEntity = new StockOrderEntity(); - updateStockOrderEntity.setId(stockQRCodeTextEntity.getOrderId()); - updateStockOrderEntity.setPrintStatus("102"); - stockOrderService.updateById(updateStockOrderEntity); + StockPrintEntity stockPrintEntity = stockPrintService.selectById(stockQRCodeTextPDFTemplateRequest.getId()); + Map data = new HashMap(); + data.put("data", stockPrintEntity); + JasperUtils.jasperReport(request, response, data, systemPDFTemplateEntity.getPath(), "pdf"); + stockPrintEntity.setPrintStatus("102"); + stockPrintService.updateStockPrint(stockPrintEntity); } //-----------打印订单 @@ -169,6 +162,7 @@ public class StockQRCodeTextController { return ResultVOUtils.success(); } + @PostMapping("/udiwms/pdf/template/stock/order/file") public void stockOrderPDFFromTemplateFile( @RequestBody StockQRCodeTextPDFTemplateRequest stockQRCodeTextPDFTemplateRequest, @@ -205,20 +199,25 @@ public class StockQRCodeTextController { ITextPDFUtils.exportStockOrderPDFFromTemplateFile( stockQRCodeTextPDFTemplateRequest, stockOrderEntity, stockOrderDetailEntityList, request, response); */ - /*打印订单*/ - List list = stockOrderService.listOrderPrint(stockQRCodeTextPDFTemplateRequest.getId()); - if(list!=null&&list.size()>0) { - StockOrderEntity updateStockOrderEntity = new StockOrderEntity(); - updateStockOrderEntity.setId(stockQRCodeTextPDFTemplateRequest.getId()); - updateStockOrderEntity.setPrintStatus("102"); - stockOrderService.updateById(updateStockOrderEntity); - - - Map data = new HashMap(); - data.put("data", list); - JasperUtils.jasperReport(request, response, data, "jaspers/order_print_1.jasper", "pdf"); - - } + /*打印订单*/ + List 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 data = new HashMap(); + 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); + + } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/UdiTraceController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/UdiTraceController.java new file mode 100644 index 0000000..9cfcf4b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/UdiTraceController.java @@ -0,0 +1,66 @@ +package com.glxp.sale.admin.controller.inout; + +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.entity.inout.WarehouseEntity; +import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest; +import com.glxp.sale.admin.req.inout.WarehouseQueryRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; +import com.glxp.sale.admin.res.inout.UdiTraceResponse; +import com.glxp.sale.admin.service.basic.UdiRelevanceService; +import com.glxp.sale.admin.service.inout.CodesService; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.common.util.ResultVOUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; + +@RestController +public class UdiTraceController { + + @Resource + private CodesService warehouseService; + @Resource + UdiRelevanceService udiRelevanceService; + + @GetMapping("udiwarehouse/trace/filter") + public BaseResponse list(WarehouseQueryRequest warehouseQueryRequest) { + List warehouseEntityList = warehouseService.findByOrderId(warehouseQueryRequest); + if (warehouseEntityList != null && warehouseEntityList.size() > 0) { + WarehouseEntity warehouseEntity = warehouseEntityList.get(0); + String udi = warehouseEntity.getCode().substring(2, 16); + FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); + filterUdiInfoRequest.setNameCode(udi); + List udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); + UdiRelevanceResponse udiRelevance = null; + if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) { + udiRelevance = udiRelevanceResponses.get(0); + } + + UdiRelevanceResponse finalUdiRelevance = udiRelevance; + List udiTraceResponseList = warehouseEntityList.stream().map(item -> + { + UdiTraceResponse udiTraceResponse = new UdiTraceResponse(); + BeanUtils.copyProperties(item, udiTraceResponse); + if(finalUdiRelevance!=null){ + udiTraceResponse.setYlqxzcrbarmc(finalUdiRelevance.getYlqxzcrbarmc()); + udiTraceResponse.setCpmctymc(finalUdiRelevance.getCpmctymc()); + udiTraceResponse.setGgxh(finalUdiRelevance.getGgxh()); + } + return udiTraceResponse; + }).collect(Collectors.toList()); + PageInfo pageInfo; + pageInfo = new PageInfo<>(udiTraceResponseList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(udiTraceResponseList); + return ResultVOUtils.success(pageSimpleResponse); + }else { + return ResultVOUtils.error(500,"未找到该条码！"); + } + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java index 0ae9292..d69aef1 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java @@ -24,6 +24,8 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.List; +import static com.glxp.sale.admin.constant.Constant.SYSTEM_CUSTOMER_ID; + @RestController public class InvProductsController { @@ -34,6 +36,9 @@ public class InvProductsController { @GetMapping("spms/inv/products/filter") public BaseResponse filterInvProduct(FilterInvProductRequest filterInvProductRequest) { + if (SYSTEM_CUSTOMER_ID.equals(filterInvProductRequest.getCustomerId())) { + filterInvProductRequest.setCustomerId(null); + } List invProductResponses = invProductService.filterJoinInvProduct(filterInvProductRequest); PageInfo pageInfo; pageInfo = new PageInfo<>(invProductResponses); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/itextpdf/PDFDawnloadController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/itextpdf/PDFDawnloadController.java index 27bae2f..6e18d9f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/itextpdf/PDFDawnloadController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/itextpdf/PDFDawnloadController.java @@ -7,10 +7,12 @@ import com.alibaba.fastjson.JSONObject; import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; import com.glxp.sale.admin.entity.inout.ErpOrderEntity; import com.glxp.sale.admin.entity.inout.FilterErpOrderRequest; +import com.glxp.sale.admin.entity.inout.IOOrderPdfEntity; import com.glxp.sale.admin.entity.inout.OrderEntity; import com.glxp.sale.admin.entity.param.SystemPDFModuleEntity; import com.glxp.sale.admin.entity.param.SystemPDFTemplateEntity; import com.glxp.sale.admin.entity.param.SystemPDFTemplateRelevanceEntity; +import com.glxp.sale.admin.req.basic.BussinessTypeFilterRequest; import com.glxp.sale.admin.req.itextpdf.InoutOrderDetailPDFFileRequest; import com.glxp.sale.admin.req.itextpdf.InoutOrderDetailPDFCodeRequest; import com.glxp.sale.admin.req.itextpdf.InspectionPDFTemplateRequest; @@ -22,9 +24,11 @@ import com.glxp.sale.admin.service.param.SystemPDFModuleService; import com.glxp.sale.admin.service.param.SystemPDFTemplateRelevanceService; import com.glxp.sale.admin.service.param.SystemPDFTemplateService; import com.glxp.sale.admin.util.ITextPDFUtils; +import com.glxp.sale.admin.util.JasperUtils; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; +import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -32,6 +36,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.awt.image.BufferedImage; import java.io.File; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -154,22 +159,29 @@ public class PDFDawnloadController { SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId())); if (systemPDFTemplateEntity == null) return; - inoutOrderDetailPDFFileRequest.setPath(systemPDFTemplateEntity.getPath()); - inoutOrderDetailPDFFileRequest.setRowCount(systemPDFTemplateEntity.getRowCount()); - inoutOrderDetailPDFFileRequest.setQrcodeCount(systemPDFTemplateEntity.getQrcodeCount()); - //----------------------------------------------- - inoutOrderDetailPDFFileRequest.setFromCorp(orderEntity.getFromCorp()); - inoutOrderDetailPDFFileRequest.setFromType(orderEntity.getFromType()); - inoutOrderDetailPDFFileRequest.setActDate(orderEntity.getActDate()); - BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction()); - inoutOrderDetailPDFFileRequest.setActionName(bussinessTypeEntity == null ? " " : bussinessTypeEntity.getName()); FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest(); filterErpOrderRequest.setOrderId(inoutOrderDetailPDFFileRequest.getOrderId()); List erpOrderEntityList = orderDetailService.filterAllMyErpOrder(filterErpOrderRequest); + BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest(); + bussinessTypeFilterRequest.setEnabled(true); + List bussinessTypeEntities = bussinessTypeService.filterList(bussinessTypeFilterRequest); + if (erpOrderEntityList != null && erpOrderEntityList.size() > 0) { + List ioOrderPdfEntities = new ArrayList<>(); + for (ErpOrderEntity erpOrderEntity : erpOrderEntityList) { + IOOrderPdfEntity ioOrderPdfEntity = new IOOrderPdfEntity(); + BeanUtils.copyProperties(erpOrderEntity, ioOrderPdfEntity); + BeanUtils.copyProperties(orderEntity, ioOrderPdfEntity); + ioOrderPdfEntity.setAction(getName(bussinessTypeEntities, ioOrderPdfEntity.getAction())); + ioOrderPdfEntities.add(ioOrderPdfEntity); + } + + Map data = new HashMap(); + data.put("data", ioOrderPdfEntities); + JasperUtils.jasperReport(request, response, data, systemPDFTemplateEntity.getPath(), "pdf"); + + } - ITextPDFUtils.exportOrderDetailPDFFromTemplateFile( - inoutOrderDetailPDFFileRequest, erpOrderEntityList, request, response); } @PostMapping("/udiwms/pdf/template/preview") @@ -177,7 +189,6 @@ public class PDFDawnloadController { @RequestBody InspectionPDFTemplateRequest inspectionPDFTemplateRequest) throws Exception { - return ResultVOUtils.success(); } @@ -256,4 +267,13 @@ public class PDFDawnloadController { rMap.put("data", systemPDFTemplateEntity.getParam()); return rMap; } + + public String getName(List bussinessTypeEntities, String action) { + for (BussinessTypeEntity bussinessTypeEntity : bussinessTypeEntities) { + if (bussinessTypeEntity.getAction().equals(action)) { + return bussinessTypeEntity.getName(); + } + } + return action; + } } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemPDFTemplateController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemPDFTemplateController.java index 33b5d7b..f04bdec 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemPDFTemplateController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemPDFTemplateController.java @@ -43,7 +43,7 @@ public class SystemPDFTemplateController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - systemPDFTemplateRequest.setType(2); +// systemPDFTemplateRequest.setType(2); List systemPDFTemplateEntityList = systemPDFTemplateService.queryPage(systemPDFTemplateRequest); List systemPDFTemplateResponseList = systemPDFTemplateEntityList.stream().map(item -> { SystemPDFTemplateResponse systemPDFTemplateResponse = new SystemPDFTemplateResponse(); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderImportLogController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderImportLogController.java index 00c84c1..2d15a9f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderImportLogController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderImportLogController.java @@ -51,6 +51,7 @@ public class ThrOrderImportLogController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + filterUdiIpLogRequest.setThirdSysFk(null); List udiInfoImportLogEntities = thrOrderImportLogService.filterImportLog(filterUdiIpLogRequest); PageInfo pageInfo; @@ -156,7 +157,7 @@ public class ThrOrderImportLogController { // 滤过第一行标题 row = sheet.getRow(0); if ((row.getCell(0) == null || row.getCell(1) == null || row.getCell(2) == null - || row.getCell(3) == null || row.getCell(4) == null || row.getCell(5) == null|| row.getCell(6) == null) || + || row.getCell(3) == null || row.getCell(4) == null || row.getCell(5) == null || row.getCell(6) == null) || (!"单据号".equals(row.getCell(0).getStringCellValue()) || !"单据日期".equals(row.getCell(1).getStringCellValue()) || !"往来单位ID".equals(row.getCell(2).getStringCellValue()) @@ -166,7 +167,7 @@ public class ThrOrderImportLogController { || !"产品ID".equals(row.getCell(6).getStringCellValue()))) { return ResultVOUtils.error(500, "文件格式错误！"); } - for (int k = sheet.getFirstRowNum()+1; k <= sheet.getLastRowNum(); k++) { + for (int k = sheet.getFirstRowNum() + 1; k <= sheet.getLastRowNum(); k++) { row = sheet.getRow(k); if (row == null || row.getRowNum() <= 0) { continue; @@ -288,6 +289,7 @@ public class ThrOrderImportLogController { } return ResultVOUtils.success("上传成功"); } + public boolean filterEmpty(Row row) { if (row.getCell(0) != null) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessOriginTypeDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessOriginTypeDao.java new file mode 100644 index 0000000..c996e79 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessOriginTypeDao.java @@ -0,0 +1,13 @@ +package com.glxp.sale.admin.dao.basic; + +import com.glxp.sale.admin.entity.basic.BussinessOriginTypeEntity; +import com.glxp.sale.admin.req.basic.BussinessOriginTypeFilterRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface BussinessOriginTypeDao { + + List filterList(BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessLocalTypeEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessLocalTypeEntity.java index c2aa904..c3421ef 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessLocalTypeEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessLocalTypeEntity.java @@ -9,6 +9,7 @@ public class BussinessLocalTypeEntity { private String action; private String name; private String localAction; + private String originAction; private String localName; private String remark; private Boolean enable; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessOriginTypeEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessOriginTypeEntity.java new file mode 100644 index 0000000..37ff779 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessOriginTypeEntity.java @@ -0,0 +1,11 @@ +package com.glxp.sale.admin.entity.basic; + +import lombok.Data; + +@Data +public class BussinessOriginTypeEntity { + private String id; + private String name; + private String action; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/StockPrintEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/StockPrintEntity.java index 308d0d6..2c40423 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/StockPrintEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/StockPrintEntity.java @@ -6,7 +6,7 @@ import java.util.Date; @Data public class StockPrintEntity { - private int id; + private Integer id; private String udiRlIdFk; private String udiCode; private String nameCode; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiRelevanceEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiRelevanceEntity.java index b65e528..fb9d366 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiRelevanceEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiRelevanceEntity.java @@ -27,6 +27,7 @@ public class UdiRelevanceEntity { private Boolean isLock; private String mainId; private String mainName; + private Integer lockStatus; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/IOOrderPdfEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/IOOrderPdfEntity.java new file mode 100644 index 0000000..5987527 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/IOOrderPdfEntity.java @@ -0,0 +1,32 @@ +package com.glxp.sale.admin.entity.inout; + +import lombok.Data; + +@Data +public class IOOrderPdfEntity { + + private String id; + private String action; + private String actDate; + private String fromCorp; + private String fromType; + + private String erpOrderId; + private String companyname; + private String goodsid; + private String goodsname; + private String batchNo; + private String warehouseCode; + private String productDate; + private String expireDate; + private Integer erpCount; + private Integer reCount; + private String nameCode; + private String productCompany; + private String coName; + private String authCode; + private String packSpec; + private String packRatio; + private Integer count; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SystemPDFModuleEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SystemPDFModuleEntity.java index c181c22..69804d2 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SystemPDFModuleEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SystemPDFModuleEntity.java @@ -15,4 +15,5 @@ public class SystemPDFModuleEntity { private String remark; private Date create_time; private Date update_time; + private String templateDlUrl; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrOrderImportDetailEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrOrderImportDetailEntity.java index cf094c5..b5b9e1f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrOrderImportDetailEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrOrderImportDetailEntity.java @@ -27,6 +27,6 @@ public class ThrOrderImportDetailEntity { private String remark; private String genKeyFk; private String thirdSysFk; - + private String originType; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessLocalTypeFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessLocalTypeFilterRequest.java index cdf44a5..e42acea 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessLocalTypeFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessLocalTypeFilterRequest.java @@ -10,6 +10,6 @@ public class BussinessLocalTypeFilterRequest extends ListPageRequest { private String name; private String mainAction; private Boolean enabled; - + private String originAction; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessOriginTypeFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessOriginTypeFilterRequest.java new file mode 100644 index 0000000..5dcc026 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessOriginTypeFilterRequest.java @@ -0,0 +1,10 @@ +package com.glxp.sale.admin.req.basic; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class BussinessOriginTypeFilterRequest extends ListPageRequest { + private String action; + private String name; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/CompanyProductRelevanceRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/CompanyProductRelevanceRequest.java index c90bb33..3d3bd0e 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/CompanyProductRelevanceRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/CompanyProductRelevanceRequest.java @@ -41,4 +41,5 @@ public class CompanyProductRelevanceRequest extends ListPageRequest { private String auditStatus; + private String customerName; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterStockprintRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterStockprintRequest.java index eff4fe0..74846e4 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterStockprintRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterStockprintRequest.java @@ -19,4 +19,5 @@ public class FilterStockprintRequest extends ListPageRequest { private String genKeyFk; private String sOrderId; private String sDetailId; + private String id; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterUdiInfoRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterUdiInfoRequest.java index 54d5e2d..cb7a2af 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterUdiInfoRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterUdiInfoRequest.java @@ -37,7 +37,7 @@ public class FilterUdiInfoRequest extends ListPageRequest { private Integer filterType; //0:全部，1.对照完成，2.未对照DI，3.未对照产品编码，4.未对照其他产品编码 - + private Integer lockStatus; private String customerId; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/LockUdiRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/LockUdiRequest.java new file mode 100644 index 0000000..1f12faf --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/LockUdiRequest.java @@ -0,0 +1,12 @@ +package com.glxp.sale.admin.req.basic; + +import lombok.Data; + +import java.util.List; +@Data +public class LockUdiRequest { + + List ids; + private Integer lockStatus; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/FilterOrderRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/FilterOrderRequest.java index c269812..d0dd496 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/FilterOrderRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/FilterOrderRequest.java @@ -14,7 +14,7 @@ public class FilterOrderRequest { private String corpName; private Integer limit; private Integer page; - + private String originType; private String customerId; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/param/SystemPDFModuleSaveRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/param/SystemPDFModuleSaveRequest.java index af4e279..e0c2a44 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/param/SystemPDFModuleSaveRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/param/SystemPDFModuleSaveRequest.java @@ -15,4 +15,5 @@ public class SystemPDFModuleSaveRequest { private String remark; private Date create_time; private Date update_time; + private String templateDlUrl; } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrOrderRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrOrderRequest.java index b44f094..31c7f62 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrOrderRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrOrderRequest.java @@ -18,7 +18,7 @@ public class FilterThrOrderRequest extends ListPageRequest { private String billAction; private String corpName; private String unitIdFk; - + private String originType; private List erpOrderResponses; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/CompanyProductRelevanceResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/CompanyProductRelevanceResponse.java index eda668f..ebc1916 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/CompanyProductRelevanceResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/CompanyProductRelevanceResponse.java @@ -52,4 +52,8 @@ public class CompanyProductRelevanceResponse { private String auditStatus; private Boolean isLock; + private Integer lockStatus; + private String customerName; + private String mainId; + private String mainName; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java index 24fe830..4ab4e9f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java @@ -53,6 +53,7 @@ public class UdiRelevanceResponse { private Boolean isLock; private String mainId; private String mainName; + private Integer lockStatus; public int getBhzxxsbzsl() { if (bhzxxsbzsl == null || bhzxxsbzsl == 0) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/inout/ErpOrderResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/inout/ErpOrderResponse.java index 9391e7f..20f7b28 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/inout/ErpOrderResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/inout/ErpOrderResponse.java @@ -14,6 +14,7 @@ public class ErpOrderResponse { private String billFlag; private String unitIdFk; private String customerId; + private String originType; private List subErpOrders; public String getUnitIdFk() { @@ -104,6 +105,14 @@ public class ErpOrderResponse { this.billFlag = billFlag; } + public String getOriginType() { + return originType; + } + + public void setOriginType(String originType) { + this.originType = originType; + } + public static class SubErpOrder { private String productId; private String productName; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/inout/UdiTraceResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/inout/UdiTraceResponse.java new file mode 100644 index 0000000..9f6f156 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/inout/UdiTraceResponse.java @@ -0,0 +1,20 @@ +package com.glxp.sale.admin.res.inout; + +import lombok.Data; + +@Data +public class UdiTraceResponse { + + private String orderId; + private String actDate; + private String mainAction; + private String action; + private String fromCorp; + private Integer count; + private String cpmctymc; + private String ylqxzcrbarmc; + private String ggxh; + private String batchNo; + private String produceDate; + private String expireDate; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/param/SystemPDFModuleResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/param/SystemPDFModuleResponse.java index a0edcc8..6c06c30 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/param/SystemPDFModuleResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/param/SystemPDFModuleResponse.java @@ -15,6 +15,6 @@ public class SystemPDFModuleResponse { private String remark; private Date create_time; private Date update_time; - + private String templateDlUrl; private String templateName; } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessOriginTypeService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessOriginTypeService.java new file mode 100644 index 0000000..68f6e5d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessOriginTypeService.java @@ -0,0 +1,14 @@ +package com.glxp.sale.admin.service.basic; + +import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity; +import com.glxp.sale.admin.entity.basic.BussinessOriginTypeEntity; +import com.glxp.sale.admin.req.basic.BussinessLocalTypeFilterRequest; +import com.glxp.sale.admin.req.basic.BussinessOriginTypeFilterRequest; + +import java.util.List; + +public interface BussinessOriginTypeService { + + List filterList(BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessOriginTypeServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessOriginTypeServiceImpl.java new file mode 100644 index 0000000..ddf3e0c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessOriginTypeServiceImpl.java @@ -0,0 +1,33 @@ +package com.glxp.sale.admin.service.basic.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.basic.BussinessOriginTypeDao; +import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity; +import com.glxp.sale.admin.entity.basic.BussinessOriginTypeEntity; +import com.glxp.sale.admin.req.basic.BussinessOriginTypeFilterRequest; +import com.glxp.sale.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 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 data = bussinessOriginTypeDao.filterList(bussinessOriginTypeFilterRequest); + return data; + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvStockPrintService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvStockPrintService.java index 02937b0..0b2daec 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvStockPrintService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvStockPrintService.java @@ -12,6 +12,8 @@ public interface InvStockPrintService { StockPrintEntity findByNameCode(String nameCode); + StockPrintEntity selectById(String id); + StockPrintEntity findByRlId(FilterStockprintRequest filterStockprintRequest); boolean insertStockPrint(StockPrintEntity stockPrintEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvStockPrintServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvStockPrintServiceImpl.java index 4be5f46..89cf195 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvStockPrintServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvStockPrintServiceImpl.java @@ -35,6 +35,17 @@ public class InvStockPrintServiceImpl implements InvStockPrintService { return stockPrintDao.findByNameCode(prefix); } + @Override + public StockPrintEntity selectById(String id) { + FilterStockprintRequest filterStockprintRequest = new FilterStockprintRequest(); + filterStockprintRequest.setId(id); + List stockPrintEntitys = stockPrintDao.filterStockPrint(filterStockprintRequest); + if (stockPrintEntitys != null && stockPrintEntitys.size() > 0) { + return stockPrintEntitys.get(0); + } + return null; + } + @Override public StockPrintEntity findByRlId(FilterStockprintRequest udiRlIdFk) { return stockPrintDao.findByRlId(udiRlIdFk); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/TaskExecutorConfig.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/TaskExecutorConfig.java index 9388cc8..a0b9d99 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/TaskExecutorConfig.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/TaskExecutorConfig.java @@ -31,10 +31,10 @@ public class TaskExecutorConfig implements AsyncConfigurer { return threadPool; } - public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() { - - return new MyAsyncExceptionHandler(); - } +// public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() { +// +// return new MyAsyncExceptionHandler(); +// } /** * 自定义异常处理类 diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/TestThread.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/TestThread.java new file mode 100644 index 0000000..0606f20 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/TestThread.java @@ -0,0 +1,23 @@ +package com.glxp.sale.admin.thread; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; + + +@Service +public class TestThread { + Logger logger = LoggerFactory.getLogger(TestThread.class); + + @Async + public void test() { + String data[] = null; + logger.error(data[1]); + if ("2222".equals(data)) { + logger.error("----1"); + } + + } + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/upload/uploadController.java b/api-admin/src/main/java/com/glxp/sale/admin/upload/uploadController.java index a4c774c..8c70ef9 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/upload/uploadController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/upload/uploadController.java @@ -34,8 +34,8 @@ public class uploadController { String fileName = file.getOriginalFilename(); String fileType = fileName.substring(fileName.lastIndexOf(".")); // 文件类型判断 - if (StringUtils.isBlank(fileType) || !fileType.equals(".pdf")) { - return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件只能是 pdf 格式"); + if (StringUtils.isBlank(fileType) || !fileType.equals(".jasper")) { + return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件只能是 jasper 格式"); } String newName = UUID.randomUUID()+fileType;//生成新文件名 String savePath = "d:/1s/udiwms/pdf/template"; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/JasperUtils.java b/api-admin/src/main/java/com/glxp/sale/admin/util/JasperUtils.java index a7b86c2..fefc9ac 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/util/JasperUtils.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/JasperUtils.java @@ -1,8 +1,6 @@ package com.glxp.sale.admin.util; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; +import java.io.*; import java.util.HashMap; import java.util.Locale; import java.util.Map; @@ -53,9 +51,10 @@ public class JasperUtils { map.put("JSON_INPUT_STREAM", is); //填充报表数据 map.put(JsonQueryExecuterFactory.JSON_LOCALE, Locale.ENGLISH); - ClassPathResource resource = new ClassPathResource(jasperResource); - - InputStream jasperStream = resource.getInputStream(); +// ClassPathResource resource = new ClassPathResource(jasperResource); + FileInputStream jasperStream = new FileInputStream(new File(jasperResource)); + +// InputStream jasperStream = resource.getInputStream(); JasperReport jasperReport = (JasperReport) JRLoader.loadObject(jasperStream); //报表填充 diff --git a/api-admin/src/main/resources/application-pro.properties b/api-admin/src/main/resources/application-pro.properties index a1dd855..5586b79 100644 --- a/api-admin/src/main/resources/application-pro.properties +++ b/api-admin/src/main/resources/application-pro.properties @@ -46,3 +46,4 @@ STOCK_PRINT_POST=http://139.159.187.130:8080/UDI_WMS_MC/udiwms/stockprint/post spring.jackson.date-format=yyyy-MM-dd HH:mm:ss spring.jackson.time-zone=GMT+8 +spring.main.allow-bean-definition-overriding=true diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/CustomerInfoDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/CustomerInfoDao.xml index 86873cf..a9a6b22 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/CustomerInfoDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/auth/CustomerInfoDao.xml @@ -9,7 +9,7 @@ FROM customer_info - AND customerName = #{customerName} + AND customerName LIKE concat('%',#{customerName},'%') diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml index 7c40601..68c8328 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml @@ -16,6 +16,9 @@ AND enable =#{enabled} + + AND originAction =#{originAction} + @@ -24,7 +27,7 @@ - select * FROM basic_bustype_local WHERE id = #{id} + select * + FROM basic_bustype_local + WHERE id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml new file mode 100644 index 0000000..fe862e2 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml @@ -0,0 +1,21 @@ + + + + + + + + diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 6526d3a..0dc282a 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -11,7 +11,7 @@ basic_udirel.thirdId1,basic_udirel.thirdId2,basic_udirel.thirdId3,basic_udirel.thirdId4, basic_udirel.thirdName1,basic_udirel.thirdName2,basic_udirel.thirdName3,basic_udirel.thirdName4, basic_udirel.manufactory,basic_udirel.measname,basic_udirel.ybbm,basic_udirel.sptm, - basic_udirel.isDisable, basic_udirel.isLock, + basic_udirel.isDisable, basic_udirel.isLock,basic_udirel.lockStatus, basic_products.nameCode,basic_products.packRatio,basic_products.packLevel, basic_products.bhxjsl,basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl, basic_products.bhxjcpbm,basic_products.bzcj, @@ -19,7 +19,8 @@ basic_products.cpmctymc,basic_products.cplb, basic_products.flbm,basic_products.ggxh,basic_products.qxlb,basic_products.tyshxydm, basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,basic_products.ylqxzcrbarywmc, - basic_products.sydycpbs,basic_products.uuid,basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType,basic_products.productType + basic_products.sydycpbs,basic_products.uuid,basic_products.sjcpbm,basic_products.versionNumber, + basic_products.diType,basic_products.productType FROM basic_udirel inner JOIN basic_products ON basic_products.uuid = basic_udirel.uuid @@ -42,6 +43,10 @@ AND basic_udirel.id = #{id} + + AND basic_udirel.lockStatus = #{lockStatus} + + AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh},'%') @@ -60,7 +65,7 @@ basic_udirel.id, basic_udirel.thirdId,basic_udirel.thirdName,basic_udirel.isUseDy, basic_udirel.thirdId1,basic_udirel.thirdId2,basic_udirel.thirdId3,basic_udirel.thirdId4, - basic_udirel.ybbm,basic_udirel.sptm,basic_udirel.isDisable, basic_udirel.isLock, + basic_udirel.ybbm,basic_udirel.sptm,basic_udirel.isDisable, basic_udirel.isLock,basic_udirel.lockStatus, basic_udirel.thirdName1,basic_udirel.thirdName2,basic_udirel.thirdName3,basic_udirel.thirdName4, basic_udirel.manufactory,basic_udirel.measname, basic_products.nameCode,basic_products.packRatio,basic_products.packLevel,basic_products.bhxjsl, @@ -129,7 +134,9 @@ AND thirdId4 is NULL and basic_products.flbm ]]> '' - + + AND basic_udirel.lockStatus = #{lockStatus} + ORDER BY updateTime DESC @@ -210,7 +217,7 @@ ( thirdId,thirdName,uuid,isUseDy,updateTime, thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock - ,mainId,mainName + ,mainId,mainName,lockStatus ) values ( @@ -232,7 +239,7 @@ #{ybbm}, #{sptm}, #{isDisable}, - #{isLock}, #{mainId},#{mainName} + #{isLock}, #{mainId},#{mainName},#{lockStatus} ) @@ -277,6 +284,7 @@ isDisable=#{isDisable}, isLock=#{isLock}, mainId=#{mainId}, + lockStatus=#{lockStatus}, mainName=#{mainName}, WHERE id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml index d176275..fd91255 100644 --- a/api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml @@ -27,7 +27,7 @@ basic_udirel.thirdName1,basic_udirel.thirdName2, basic_udirel.thirdName3,basic_udirel.thirdName4, basic_udirel.ybbm,basic_udirel.sptm, - basic_udirel.manufactory,basic_udirel.measname, + basic_udirel.manufactory,basic_udirel.measname,basic_udirel.lockStatus, basic_products.nameCode,basic_products.packRatio,basic_products.packLevel,basic_products.bhxjsl, basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl,basic_products.bhxjcpbm, basic_products.bzcj,basic_products.addType, @@ -35,12 +35,14 @@ basic_products.cplb,basic_products.flbm,basic_products.ggxh,basic_products.qxlb, basic_products.tyshxydm,basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh, basic_products.ylqxzcrbarywmc,basic_products.sydycpbs,basic_products.uuid, - basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType + basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType, + customer_info.customerName, basic_udirel.mainId,basic_udirel.mainName FROM company_product_relevance inner JOIN basic_udirel ON company_product_relevance.udiRlIdFk = basic_udirel.id inner JOIN basic_products ON basic_udirel.uuid = basic_products.uuid + inner JOIN customer_info on customer_info.customerId = company_product_relevance.customerId AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc},'%') @@ -107,6 +109,9 @@ AND company_product_relevance.id = #{id} + + AND customer_info.customerName = #{customerName} + ORDER BY updateTime DESC @@ -114,17 +119,24 @@ @@ -182,18 +194,20 @@ - replace INTO company_product_relevance(customerId,productId,enterpriseId,registrationId, + replace + INTO company_product_relevance(customerId,productId,enterpriseId,registrationId, create_time,update_time,auditStatus,productUuid,udiRlIdFk) values ( - #{customerId}, - #{productId}, - #{enterpriseId}, - #{registrationId}, - #{create_time}, - #{update_time}, - #{auditStatus}, - #{productUuid},#{udiRlIdFk} - ) + #{customerId}, + #{productId}, + #{enterpriseId}, + #{registrationId}, + #{create_time}, + #{update_time}, + #{auditStatus}, + #{productUuid}, + #{udiRlIdFk} + ) diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvStockPrintDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvStockPrintDao.xml index 67f3ce0..47853d9 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvStockPrintDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvStockPrintDao.xml @@ -37,6 +37,9 @@ AND sOrderId = #{sOrderId} + + AND id = #{id} + diff --git a/api-admin/src/main/resources/mybatis/mapper/param/SystemPDFModuleDao.xml b/api-admin/src/main/resources/mybatis/mapper/param/SystemPDFModuleDao.xml index 0e46336..9435e7c 100644 --- a/api-admin/src/main/resources/mybatis/mapper/param/SystemPDFModuleDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/param/SystemPDFModuleDao.xml @@ -5,7 +5,7 @@