From 6e864adaf809a2eeba7155a653cf37fa05ad0d8c Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 7 Dec 2021 10:43:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9B=B8=E4=BA=92=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2=EF=BC=8C=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E7=AD=89?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sale/admin/constant/ConstantStatus.java | 1 + .../controller/auth/LoginController.java | 15 +- .../basic/BussinessLocalTypeController.java | 22 ++ .../basic/CorpImportLogController.java | 44 ++- .../basic/UdiInfoImportLogController.java | 44 ++- .../CompanyProductRelevanceController.java | 15 +- .../controller/inout/OrderController.java | 71 ++++- .../inout/OrderDetailController.java | 48 +++- .../inout/StockOrderController.java | 12 +- .../inout/StockOrderDetailController.java | 21 +- .../controller/inout/WareHouseController.java | 11 + .../inout/utils/CheckOrderUtils.java | 250 ++++++++++++++++++ .../inout/utils/ContrastErpUtil.java | 162 +++++++++++- .../controller/inout/utils/InoutUtils.java | 54 +++- .../thrsys/ThrOrderImportLogController.java | 45 ++++ .../ThrProductsImportLogController.java | 45 +++- .../sale/admin/dao/auth/AuthAdminDao.java | 11 + .../dao/basic/BussinessLocalTypeDao.java | 2 + .../admin/entity/inout/ErpOrderEntity.java | 8 + .../sale/admin/entity/inout/OrderEntity.java | 1 + .../sale/admin/httpclient/ErpOrderClient.java | 4 +- .../sale/admin/req/auth/LoginRequest.java | 2 + .../admin/req/inout/OrderFilterRequest.java | 2 +- .../req/inout/UpdateExportStatusRequest.java | 1 + .../admin/res/basic/UdiRelevanceResponse.java | 9 +- .../admin/res/inout/ErpOrderResponse.java | 12 +- .../admin/service/auth/AuthAdminService.java | 1 + .../auth/impl/AuthAdminServiceImpl.java | 10 + .../basic/BussinessLocalTypeService.java | 2 + .../service/basic/UdiRelevanceService.java | 2 + .../impl/BussinessLocalTypeServiceImpl.java | 5 + .../basic/impl/UdiRelevanceServiceImpl.java | 10 + .../service/inout/StockOrderService.java | 5 +- .../inout/impl/StockOrderServiceImpl.java | 8 + .../admin/service/thrsys/ThrDataService.java | 17 +- .../admin/thread/BasicGenExcelService.java | 6 +- .../admin/thread/InvProductsTrService.java | 15 +- .../admin/thread/IoTransInoutService.java | 55 +++- .../main/resources/application-pro.properties | 4 +- .../mybatis/mapper/auth/AuthAdminDao.xml | 24 +- .../mapper/basic/BussinessLocalTypeDao.xml | 2 +- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 81 +++--- .../info/CompanyProductRelevanceDao.xml | 4 +- .../mybatis/mapper/inout/CodesDao.xml | 4 +- .../mybatis/mapper/inout/OrderDao.xml | 23 +- .../mybatis/mapper/inout/OrderDetail.xml | 1 + 46 files changed, 1048 insertions(+), 143 deletions(-) create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/CheckOrderUtils.java diff --git a/api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantStatus.java b/api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantStatus.java index 5d7bf76..41901dd 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantStatus.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantStatus.java @@ -30,6 +30,7 @@ public class ConstantStatus { public static String SORDER_ALLOC = "2";//未配货 public static String SORDER_CHECK = "3";//待校验 public static String SORDER_CHECKED = "4";//已校验 + public static String SORDER_DELIVER = "5";//已送货 public static String SORDER_PRINT_UN = "101";//101：未打印，102：已打印 public static String SORDER_PRINT_ED = "102";// 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 2fed3a4..8dedfda 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 @@ -48,6 +48,7 @@ public class LoginController { /** * 用户登录 + * * @return */ @PostMapping(value = "/login") @@ -57,8 +58,11 @@ public class LoginController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - - AuthAdmin authAdmin = authAdminService.findByUserName(loginRequest.getUsername()); + AuthAdmin authAdmin; + if (loginRequest.getType() != null && loginRequest.getType() == 1) { + authAdmin = authAdminService.findByUser(loginRequest.getUsername(), "110"); + } else + authAdmin = authAdminService.findByUserName(loginRequest.getUsername()); if (authAdmin == null) { throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); } @@ -90,6 +94,7 @@ public class LoginController { /** * 获取登录用户信息 + * * @return */ @AuthRuleAnnotation("") @@ -106,7 +111,7 @@ public class LoginController { BeanUtils.copyProperties(authAdmin, loginUserInfoResponse); loginUserInfoResponse.setAuthRules(authRules); - CompanyEntity companyEntity = companyService.findCompany(loginUserInfoResponse.getCustomerId()); + CompanyEntity companyEntity = companyService.findCompany(loginUserInfoResponse.getCustomerId()); loginUserInfoResponse.setCompanyName(companyEntity.getCompanyName()); @@ -115,15 +120,17 @@ public class LoginController { /** * 登出 + * * @return */ @PostMapping("/admin/auth/login/out") - public BaseResponse out(){ + public BaseResponse out() { return ResultVOUtils.success(); } /** * 修改密码 + * * @return */ @AuthRuleAnnotation("") // 需要登录验证,但是不需要权限验证时,value 值填空字符串 diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java index d534d3c..5d1f0af 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java @@ -90,4 +90,26 @@ public class BussinessLocalTypeController { } + @PostMapping("/udiwms/localBusType/add") + public BaseResponse addBussinessType(@RequestBody BussinessLocalTypeEntity bussinessTypeEntity, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (bussinessTypeEntity != null) { + BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessTypeService.findBTByAction(bussinessTypeEntity.getAction()); + if (bussinessLocalTypeEntity != null) { + ResultVOUtils.error(999, "业务类型已存在！"); + } else { + bussinessTypeService.insertBussinessType(bussinessTypeEntity); + } + + } else { + ResultVOUtils.error(999, "参数错误"); + } + return ResultVOUtils.success("更新成功"); + } + + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/CorpImportLogController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/CorpImportLogController.java index 8f9b881..fae9757 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/CorpImportLogController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/CorpImportLogController.java @@ -176,7 +176,10 @@ public class CorpImportLogController { for (int k = sheet.getFirstRowNum() + 1; k <= sheet.getLastRowNum(); k++) { row = sheet.getRow(k); - if (row.getRowNum() <= 0) { + if (row == null || row.getRowNum() <= 0) { + continue; + } + if (filterEmpty(row)) { continue; } CorpImportDetailEntity corpImportDetailEntity = new CorpImportDetailEntity(); @@ -371,5 +374,44 @@ public class CorpImportLogController { basicCorpImportService.importCorps(genKey); return ResultVOUtils.success("上传成功"); } + public boolean filterEmpty(Row row) { + if (row.getCell(0) != null) { + row.getCell(0).setCellType(CellType.STRING); + } + if (row.getCell(1) != null) { + row.getCell(1).setCellType(CellType.STRING); + } + if (row.getCell(2) != null) { + row.getCell(2).setCellType(CellType.STRING); + } + if (row.getCell(3) != null) { + row.getCell(3).setCellType(CellType.STRING); + } + if (row.getCell(4) != null) { + row.getCell(4).setCellType(CellType.STRING); + } + if (row.getCell(5) != null) { + row.getCell(5).setCellType(CellType.STRING); + } + if (row.getCell(6) != null) { + row.getCell(6).setCellType(CellType.STRING); + } + 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(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) && + ("".equals(row.getCell(0).getStringCellValue()) + && "".equals(row.getCell(1).getStringCellValue()) + && "".equals(row.getCell(2).getStringCellValue()) + && "".equals(row.getCell(3).getStringCellValue()) + && "".equals(row.getCell(4).getStringCellValue()) + && "".equals(row.getCell(5).getStringCellValue()) + && "".equals(row.getCell(6).getStringCellValue())) + )) { + return true; + } + return false; + } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoImportLogController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoImportLogController.java index d71708c..7220202 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoImportLogController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoImportLogController.java @@ -167,7 +167,10 @@ public class UdiInfoImportLogController { } for (int k = sheet.getFirstRowNum()+1; k <= sheet.getLastRowNum(); k++) { row = sheet.getRow(k); - if (row.getRowNum() <= 0) { + if (row == null || row.getRowNum() <= 0) { + continue; + } + if (filterEmpty(row)) { continue; } UdiInfoImportDetailEntity udiInfoImportEntity = new UdiInfoImportDetailEntity(); @@ -328,5 +331,44 @@ public class UdiInfoImportLogController { return ResultVOUtils.success("后台已开始下载并更新，请稍后刷新查看!"); } + public boolean filterEmpty(Row row) { + if (row.getCell(0) != null) { + row.getCell(0).setCellType(CellType.STRING); + } + if (row.getCell(1) != null) { + row.getCell(1).setCellType(CellType.STRING); + } + if (row.getCell(2) != null) { + row.getCell(2).setCellType(CellType.STRING); + } + if (row.getCell(3) != null) { + row.getCell(3).setCellType(CellType.STRING); + } + if (row.getCell(4) != null) { + row.getCell(4).setCellType(CellType.STRING); + } + if (row.getCell(5) != null) { + row.getCell(5).setCellType(CellType.STRING); + } + if (row.getCell(6) != null) { + row.getCell(6).setCellType(CellType.STRING); + } + 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(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) && + ("".equals(row.getCell(0).getStringCellValue()) + && "".equals(row.getCell(1).getStringCellValue()) + && "".equals(row.getCell(2).getStringCellValue()) + && "".equals(row.getCell(3).getStringCellValue()) + && "".equals(row.getCell(4).getStringCellValue()) + && "".equals(row.getCell(5).getStringCellValue()) + && "".equals(row.getCell(6).getStringCellValue())) + )) { + return true; + } + return false; + } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyProductRelevanceController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyProductRelevanceController.java index 27afc19..ca6e9d3 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyProductRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyProductRelevanceController.java @@ -48,14 +48,15 @@ public class CompanyProductRelevanceController { } List basicInstrumentMaintainRelevanceResponses = null; + companyProductRelevanceResponse.setDiType(1); basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceResponse); - if (basicInstrumentMaintainRelevanceResponses != null && basicInstrumentMaintainRelevanceResponses.size() > 0) { - for (CompanyProductRelevanceResponse basicInstrumentMaintainRelevanceResponse : basicInstrumentMaintainRelevanceResponses) { - if (basicInstrumentMaintainRelevanceResponse.getDiType() == 2 && basicInstrumentMaintainRelevanceResponse.getIsUseDy() != 1) { - basicInstrumentMaintainRelevanceResponse.setNameCode(basicInstrumentMaintainRelevanceResponse.getSjcpbm()); - } - } - } +// if (basicInstrumentMaintainRelevanceResponses != null && basicInstrumentMaintainRelevanceResponses.size() > 0) { +// for (CompanyProductRelevanceResponse basicInstrumentMaintainRelevanceResponse : basicInstrumentMaintainRelevanceResponses) { +// if (basicInstrumentMaintainRelevanceResponse.getDiType() == 2 && basicInstrumentMaintainRelevanceResponse.getIsUseDy() != 1) { +// basicInstrumentMaintainRelevanceResponse.setNameCode(basicInstrumentMaintainRelevanceResponse.getSjcpbm()); +// } +// } +// } PageInfo pageInfo; pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses); 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 7591de7..c6e4956 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 @@ -3,13 +3,11 @@ package com.glxp.sale.admin.controller.inout; import com.github.pagehelper.PageInfo; 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; import com.glxp.sale.admin.controller.inout.utils.InoutUtils; import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; +import com.glxp.sale.admin.entity.inout.*; import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; -import com.glxp.sale.admin.entity.inout.ErpOrderEntity; -import com.glxp.sale.admin.entity.inout.FilterErpOrderRequest; -import com.glxp.sale.admin.entity.inout.OrderEntity; -import com.glxp.sale.admin.entity.inout.WarehouseEntity; import com.glxp.sale.admin.entity.udid.UdiEntity; import com.glxp.sale.admin.httpclient.ErpOrderClient; import com.glxp.sale.admin.req.inout.*; @@ -18,10 +16,12 @@ import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.service.basic.BussinessTypeService; import com.glxp.sale.admin.service.basic.UdiInfoService; import com.glxp.sale.admin.service.basic.UdiRelevanceService; +import com.glxp.sale.admin.service.inout.StockOrderService; import com.glxp.sale.admin.service.param.SystemParamConfigService; import com.glxp.sale.admin.service.inout.CodesService; import com.glxp.sale.admin.service.inout.OrderDetailService; import com.glxp.sale.admin.service.inout.OrderService; +import com.glxp.sale.admin.thread.InvProductsTrService; import com.glxp.sale.admin.thread.IoTransInoutService; import com.glxp.sale.admin.util.FilterUdiUtils; import com.glxp.sale.common.enums.ResultEnum; @@ -60,6 +60,10 @@ public class OrderController { private String ucloudUrl; @Resource IoTransInoutService ioTransInoutService; + @Resource + StockOrderService stockOrderService; + @Resource + InvProductsTrService invProductsTrService; @GetMapping("udiwms/inout/order/getUdi") public BaseResponse getUdi(@RequestParam("code") String code) { @@ -170,6 +174,65 @@ public class OrderController { return ResultVOUtils.success(pageSimpleResponse); } + + //手持终端下载订单校验 + @GetMapping("/udiwms/inout/order/download") + public BaseResponse downloadOrder(OrderFilterRequest orderFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List orderEntityList; + if (orderFilterRequest.getStatus() == null || orderFilterRequest.getStatus() == 0) { + orderFilterRequest.setStatus(4); + orderFilterRequest.setContrastStatus(2); + orderFilterRequest.setReceiveStatus(0); +// orderFilterRequest.setStatusOrOne(3); + } + if (orderFilterRequest.getCode() != null && !orderFilterRequest.getCode().equals("")) { + List warehouseEntityList = codesService.findByCode(orderFilterRequest.getCode()); + orderEntityList = orderService.filterListByCode(warehouseEntityList); + } else { + orderEntityList = orderService.filterListOr(orderFilterRequest); + } + PageInfo pageInfo; + pageInfo = new PageInfo<>(orderEntityList);//TODO 已完成单据列表 + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(orderEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } + + //手持终端验收完成后，更新订单状态 + @PostMapping("/spms/inout/order/check/updateStatus") + public BaseResponse updateStatus(@RequestBody UpdateExportStatusRequest updateExportStatusRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + OrderEntity orderEntity = orderService.findById(updateExportStatusRequest.getOrderId()); + orderEntity.setReceiveStatus(1); + orderService.updateOrder(orderEntity); + List erpIds = DataTransUtil.strToErpList(orderEntity.getErpFk()); + if (erpIds != null && erpIds.size() > 0) { + for (String id : erpIds) { + StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest(); + stockOrderFilterRequest.setBillNo(id); + StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest); + stockOrderEntity.setStatus(ConstantStatus.SORDER_DELIVER); + stockOrderService.updateById(stockOrderEntity); + + } + } + + invProductsTrService.genInvProducts(orderEntity.getId()); + + return ResultVOUtils.success("更新成功"); + } + + @GetMapping("/udiwms/inout/order/filterCode") public BaseResponse filterOrderByCode(OrderFilterByCodeRequest orderFilterByCodeRequest, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java index a244fd4..c5a116d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java @@ -2,7 +2,9 @@ package com.glxp.sale.admin.controller.inout; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.constant.ConstantStatus; +import com.glxp.sale.admin.controller.inout.utils.CheckOrderUtils; import com.glxp.sale.admin.controller.inout.utils.ContrastErpUtil; +import com.glxp.sale.admin.controller.inout.utils.DataTransUtil; import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; import com.glxp.sale.admin.entity.info.CompanyEntity; @@ -25,6 +27,7 @@ import com.glxp.sale.admin.service.basic.UdiRelevanceService; import com.glxp.sale.admin.service.info.CompanyService; import com.glxp.sale.admin.service.inout.*; import com.glxp.sale.admin.service.param.SystemParamConfigService; +import com.glxp.sale.admin.service.thrsys.ThrDataService; import com.glxp.sale.admin.service.thrsys.ThrOrderDetailService; import com.glxp.sale.admin.service.thrsys.ThrOrderService; import com.glxp.sale.admin.thread.InvDlErpStockService; @@ -66,6 +69,8 @@ public class OrderDetailController { private UdiRelevanceService udiRelevanceService; @Resource private InvDlErpStockService dlErpStockService; + @Resource + private CheckOrderUtils checkOrderUtils; @Resource @@ -87,6 +92,8 @@ public class OrderDetailController { private CompanyService companyService; @Resource private BussinessTypeService bussinessTypeService; + @Resource + ThrDataService thrDataService; @GetMapping("/udiwms/erpOrder/filter") public BaseResponse filterErpOrder(FilterOrderRequest filterErpOrderRequest, @@ -123,6 +130,8 @@ public class OrderDetailController { for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { ErpOrderResponse.SubErpOrder subErpOrder = new ErpOrderResponse.SubErpOrder(); BeanUtils.copyProperties(thrOrderDetailEntity, subErpOrder); + subErpOrder.setCount(thrOrderDetailEntity.getCount()+""); + subErpOrder.setReCount(thrOrderDetailEntity.getReCount()+""); subErpOrders.add(subErpOrder); } } @@ -151,13 +160,20 @@ public class OrderDetailController { if (thrOrderEntity == null) { return ResultVOUtils.error(ResultEnum.DATA_NOT); } + + StockOrderEntity temp = stockOrderService.findByBillNo(thrOrderEntity.getBillNo() + ""); + if(temp!=null){ + return ResultVOUtils.error(500,"单据已被选入，请勿重复选入！"); + } + + StockOrderEntity stockOrderEntity = new StockOrderEntity(); BeanUtils.copyProperties(thrOrderEntity, stockOrderEntity); BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(thrOrderEntity.getBillType()); stockOrderEntity.setBillType(bussinessTypeEntity.getLocalAction()); stockOrderEntity.setId(null); - stockOrderEntity.setStatus(ConstantStatus.SORDER_DRAFT);//未提交 + stockOrderEntity.setStatus(ConstantStatus.SORDER_ALLOC);//未提交 stockOrderEntity.setSourceType(ConstantStatus.ST_THIRD_SEL);//外部提交 stockOrderEntity.setPrintStatus(ConstantStatus.SORDER_PRINT_UN);//未打印 stockOrderEntity.setBilldate(DateUtil.formatDate(new Date())); @@ -332,9 +348,11 @@ public class OrderDetailController { erpOrderEntity.setCredate(purchaseinResponse.getBilldate()); erpOrderEntity.setGoodsid(subPurchase.getProductId()); erpOrderEntity.setGoodsname(subPurchase.getProductName()); + erpOrderEntity.setProductDate(subPurchase.getProductDate()); + erpOrderEntity.setExpireDate(subPurchase.getExpireDate()); erpOrderEntity.setBatchNo(subPurchase.getBatchNo()); - erpOrderEntity.setErpCount(Math.abs(subPurchase.getCount())); - erpOrderEntity.setReCount(Math.abs(subPurchase.getReCount())); + erpOrderEntity.setErpCount(Math.abs(Integer.parseInt(subPurchase.getCount()))); + erpOrderEntity.setReCount(Math.abs(Integer.parseInt(subPurchase.getReCount()))); erpOrderEntity.setGoodsunit(subPurchase.getSpec()); erpOrderEntities.add(erpOrderEntity); } @@ -351,7 +369,6 @@ public class OrderDetailController { OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); orderFilterRequest.setId(importErpOrderRequest.getOrderId()); OrderEntity orderEntity = orderService.findOne(orderFilterRequest); - BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction()); ErpOrderEntity exitErp = new ContrastErpUtil().vailErpExit(orderDetailService, erpOrderEntities, importErpOrderRequest.getOrderId()); if (exitErp != null) { String errMsg = "所选ERP单" + exitErp.getErpOrderId() + "已被其他出入库单" + exitErp.getOrderIdFk() + "绑定"; @@ -362,12 +379,15 @@ public class OrderDetailController { orderEntity.setErpFk(docidStr); orderService.updateOrder(orderEntity); } - orderDetailService.deleteByOrderId(importErpOrderRequest.getOrderId()); - List returnOrders = new ContrastErpUtil().transErp(erpOrderEntities, udiRelevanceService, importErpOrderRequest.getOrderId()); - orderDetailService.insertErpOrders(returnOrders); List warehouseEntityList = codesService.findByReceiptId(importErpOrderRequest.getOrderId()); - new ContrastErpUtil().contrastErp(udiInfoService, udiRelevanceService, orderDetailService, orderService, warehouseEntityList, systemParamConfigService, bussinessTypeEntity); + transInoutService.genOrderDetail(warehouseEntityList); + checkOrderUtils.check(orderEntity.getId(), erpOrderEntities); + +// List returnOrders = new ContrastErpUtil().transErp(erpOrderEntities, udiRelevanceService, importErpOrderRequest.getOrderId()); +// orderDetailService.insertErpOrders(returnOrders); +// List warehouseEntityList = codesService.findByReceiptId(importErpOrderRequest.getOrderId()); +// new ContrastErpUtil().contrastErp(udiInfoService, udiRelevanceService, orderDetailService, orderService, warehouseEntityList, systemParamConfigService, bussinessTypeEntity); } else { @@ -400,7 +420,17 @@ public class OrderDetailController { OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); orderFilterRequest.setId(filterErpOrderRequest.getOrderId()); OrderEntity orderEntity = orderService.findOne(orderFilterRequest); - transInoutService.repeatPrint(orderEntity); + List erpIds = DataTransUtil.strToErpList(orderEntity.getErpFk()); + if (erpIds != null && erpIds.size() > 0) { + List erpOrderEntities = thrDataService.getStockOrders(erpIds); + orderDetailService.deleteByOrderId(orderEntity.getId()); + List warehouseEntityList = codesService.findByReceiptId(orderEntity.getId()); + transInoutService.genOrderDetail(warehouseEntityList); + checkOrderUtils.check(orderEntity.getId(), erpOrderEntities); + } + + +// transInoutService.repeatPrint(orderEntity); return ResultVOUtils.success("后台已开始校验，请稍后刷新重试！"); } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java index 975da68..c9c4dd0 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java @@ -25,6 +25,7 @@ import com.glxp.sale.admin.req.param.SystemParamConfigRequest; import com.glxp.sale.admin.req.thrsys.FilterThrOrderDetailRequest; import com.glxp.sale.admin.req.thrsys.FilterThrOrderRequest; import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import com.glxp.sale.admin.res.inout.ErpOrderResponse; import com.glxp.sale.admin.service.basic.UdiInfoService; import com.glxp.sale.admin.service.basic.UdiRelevanceService; @@ -371,9 +372,10 @@ public class StockOrderController { List stockPrintEntities = new ArrayList<>(); for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntityList) { if (stockOrderIdsRequest.isFilterUDIType()) { - UdiInfoEntity udiInfoEntity = - udiInfoService.findByNameCode(stockOrderDetailEntity.getProductId()); - if (udiInfoEntity.getProductType() == ConstantStatus.PRODUCT_TYPE_THIRD) {//TODO udi过滤检测 +// 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()); @@ -384,7 +386,7 @@ public class StockOrderController { stockPrintEntity.setSDetailId(stockOrderDetailEntity.getId()); stockPrintEntities.add(stockPrintEntity); } - }else { + } else { StockPrintEntity stockPrintEntity = new StockPrintEntity(); stockPrintEntity.setNameCode(stockOrderDetailEntity.getProductId()); stockPrintEntity.setSOrderId(stockOrderEntity.getId()); @@ -430,7 +432,7 @@ public class StockOrderController { for (StockPrintEntity stockPrintEntity : stockPrintEntities) { StockPrinttREntity stockPrinttREntity = new StockPrinttREntity(); - BeanUtils.copyProperties(stockPrintEntity,stockPrinttREntity); + BeanUtils.copyProperties(stockPrintEntity, stockPrinttREntity); stockPrintEntity.setGenKeyFk(genKey); String udiCode = "#" + stockPrinttREntity.getNameCode() + "#" + stockPrinttREntity.getProduceDate() + "#" + stockPrinttREntity.getExpireDate() + "#" + stockPrinttREntity.getBatchNo() + "#" + stockPrinttREntity.getSerialNo() + "#" + stockPrinttREntity.getWarehouseCode() + "#" + stockPrinttREntity.getSpaceCode(); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java index e469deb..34dd3d9 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java @@ -232,12 +232,13 @@ public class StockOrderDetailController { for (String id : stockOrderIdsRequest.getIds()) { CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest(); companyProductRelevanceRequest.setId(id); + companyProductRelevanceRequest.setDiType(1); List companyProductRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest); if (companyProductRelevanceResponses != null && companyProductRelevanceResponses.size() > 0) { CompanyProductRelevanceResponse udiInfoEntity = companyProductRelevanceResponses.get(0); StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity(); - stockOrderDetailEntity.setProductId(udiInfoEntity.getThirdId()); + stockOrderDetailEntity.setProductId(udiInfoEntity.getRlId()+""); stockOrderDetailEntity.setProductName(udiInfoEntity.getCpmctymc()); stockOrderDetailEntity.setSpec(udiInfoEntity.getGgxh()); if (stockOrderIdsRequest.getUdiEntity() != null) { @@ -392,16 +393,18 @@ public class StockOrderDetailController { filterUdiInfoRequest.setNameCode(nameCode); CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest(); BeanUtils.copyProperties(filterUdiInfoRequest, companyProductRelevanceRequest); - + companyProductRelevanceRequest.setDiType(1); List basicInstrumentMaintainRelevanceResponses = null; basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest); - if (basicInstrumentMaintainRelevanceResponses != null && basicInstrumentMaintainRelevanceResponses.size() > 0) { - for (CompanyProductRelevanceResponse basicInstrumentMaintainRelevanceResponse : basicInstrumentMaintainRelevanceResponses) { - if (basicInstrumentMaintainRelevanceResponse.getDiType() == 2 && basicInstrumentMaintainRelevanceResponse.getIsUseDy() != 1) { - basicInstrumentMaintainRelevanceResponse.setNameCode(basicInstrumentMaintainRelevanceResponse.getSjcpbm()); - } - } - } + + //todo 为什么要把去掉使用单元 +// if (basicInstrumentMaintainRelevanceResponses != null && basicInstrumentMaintainRelevanceResponses.size() > 0) { +// for (CompanyProductRelevanceResponse basicInstrumentMaintainRelevanceResponse : basicInstrumentMaintainRelevanceResponses) { +// if (basicInstrumentMaintainRelevanceResponse.getDiType() == 2 && basicInstrumentMaintainRelevanceResponse.getIsUseDy() != 1) { +// basicInstrumentMaintainRelevanceResponse.setNameCode(basicInstrumentMaintainRelevanceResponse.getSjcpbm()); +// } +// } +// } PageInfo pageInfo; pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java index 7f4cf72..82676e1 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java @@ -134,6 +134,17 @@ public class WareHouseController { return ResultVOUtils.success(pageSimpleResponse); } + @GetMapping("spms/inout/dlcode/findByOrderId") + public BaseResponse downloadCodesByOrderId(WarehouseQueryRequest warehouseQueryRequest) { + List warehouseEntityList = codesService.findByOrderId(warehouseQueryRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(warehouseEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(warehouseEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } + @GetMapping("admin/warehouse/inout/findAllByOrderId") public BaseResponse findAllByOrderId(WarehouseQueryRequest warehouseQueryRequest) { List warehouseEntityList = codesService.findAllByOrderId(warehouseQueryRequest); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/CheckOrderUtils.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/CheckOrderUtils.java new file mode 100644 index 0000000..071a514 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/CheckOrderUtils.java @@ -0,0 +1,250 @@ +package com.glxp.sale.admin.controller.inout.utils; + +import com.glxp.sale.admin.constant.ConstantStatus; +import com.glxp.sale.admin.entity.inout.*; +import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest; +import com.glxp.sale.admin.req.inout.StockOrderFilterRequest; +import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; +import com.glxp.sale.admin.service.basic.UdiRelevanceService; +import com.glxp.sale.admin.service.inout.OrderDetailService; +import com.glxp.sale.admin.service.inout.OrderService; +import com.glxp.sale.admin.service.inout.StockOrderService; +import com.glxp.sale.admin.service.thrsys.ThrDataService; +import com.glxp.sale.admin.thread.InvProductsTrService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class CheckOrderUtils { + @Resource + private OrderDetailService myErpOrderService; + @Resource + UdiRelevanceService udiRelevanceService; + @Resource + private OrderService orderService; + @Resource + StockOrderService stockOrderService; + @Resource + InvProductsTrService invProductsTrService; + + public void check(String orderId, List vailOrderEntities) { + FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest(); + filterErpOrderRequest.setOrderId(orderId); + List myErpOrders = myErpOrderService.filterAllMyErpOrder(filterErpOrderRequest); + OrderEntity orderEntity = orderService.findById(orderId); + String errMsg = null; + + for (ErpOrderEntity myErpOrder : myErpOrders) { + FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); + filterUdiInfoRequest.setNameCode(myErpOrder.getNameCode()); + List udiRelevanceEntities = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest); + if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && myErpOrder.getBindRlFk() == null) { + orderEntity.setRemark("该产品DI绑定多个产品ID，请在扫码单据详情绑定对应产品ID"); + orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); + orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL); + orderService.updateOrder(orderEntity); + return; + } else { + for (ErpOrderEntity vailOrderEntity : vailOrderEntities) { + UdiRelevanceResponse udiRelevanceResponse = null; + if (udiRelevanceEntities.size() == 1) { + udiRelevanceResponse = udiRelevanceEntities.get(0); + } else { + for (UdiRelevanceResponse temps : udiRelevanceEntities) { + if ((temps.getId() + "").equals(myErpOrder.getBindRlFk())) { + udiRelevanceResponse = temps; + } + } + } + if (checkId(vailOrderEntity, udiRelevanceResponse) == null + && checkBatchNo(vailOrderEntity, myErpOrder) == null + && checkProductDate(vailOrderEntity, myErpOrder) == null + && checkExpireDate(vailOrderEntity, myErpOrder) == null + && checkWarehouse(vailOrderEntity, myErpOrder) == null + && checkCount(vailOrderEntity, myErpOrder) == null + ) { + + myErpOrder.setErpCount(vailOrderEntity.getErpCount()); + myErpOrder.setReCount(vailOrderEntity.getReCount()); + myErpOrder.setGoodsname(vailOrderEntity.getGoodsname()); + myErpOrder.setGoodsid(vailOrderEntity.getGoodsid()); + myErpOrder.setStatus("success"); + vailOrderEntity.setStatus("success"); + myErpOrderService.updateErpOrder(myErpOrder); + + break; + } else { + errMsg = checkBatchNo(vailOrderEntity, myErpOrder); + if (errMsg == null) { + errMsg = checkId(vailOrderEntity, udiRelevanceResponse); + if (errMsg == null) { + errMsg = checkProductDate(vailOrderEntity, myErpOrder); + if (errMsg == null) { + errMsg = checkExpireDate(vailOrderEntity, myErpOrder); + if (errMsg == null) { + errMsg = checkWarehouse(vailOrderEntity, myErpOrder); + if (errMsg == null) { + errMsg = checkCount(vailOrderEntity, myErpOrder); + if (errMsg != null) { + myErpOrder.setErpCount(vailOrderEntity.getErpCount()); + myErpOrder.setReCount(vailOrderEntity.getReCount()); + myErpOrder.setGoodsname(vailOrderEntity.getGoodsname()); + myErpOrder.setGoodsid(vailOrderEntity.getGoodsid()); + myErpOrder.setStatus("fail"); + vailOrderEntity.setStatus("fail"); + myErpOrderService.updateErpOrder(myErpOrder); + break; + } + } + } + } + } + } + + + } + + } + } + + + } + if (checkFinish(myErpOrders, vailOrderEntities)) { + orderEntity.setRemark("校验成功"); + orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); + orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_SUCCESS); + orderService.updateOrder(orderEntity); + + //更新业务单据为已校验 + List erpIds = DataTransUtil.strToErpList(orderEntity.getErpFk()); + if (erpIds != null && erpIds.size() > 0) { + for (String id : erpIds) { + StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest(); + stockOrderFilterRequest.setBillNo(id); + StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest); + stockOrderEntity.setStatus(ConstantStatus.SORDER_CHECKED); + stockOrderService.updateById(stockOrderEntity); + + } + } + + //生产库存 +// invProductsTrService.genInvProducts(orderEntity.getId()); + + } else { + for (ErpOrderEntity erpOrderEntity : vailOrderEntities) { + if (!checkErpOrderExit(myErpOrders, erpOrderEntity)) { + erpOrderEntity.setOrderIdFk(orderId); + erpOrderEntity.setCoName(erpOrderEntity.getGoodsname()); + erpOrderEntity.setPackSpec(erpOrderEntity.getGoodsunit()); + myErpOrderService.insertErpOrder(erpOrderEntity); + } + } + orderEntity.setRemark(errMsg); + orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); + orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL); + orderService.updateOrder(orderEntity); + } + + + } + + //校验选入业务单据是否多出，多出，则添加到详情 + public boolean checkErpOrderExit(List myErpOrders, ErpOrderEntity vailErpEntity) { + for (ErpOrderEntity myErp : myErpOrders) { + if (myErp.getGoodsid() != null && vailErpEntity.getGoodsid().equals(myErp.getGoodsid())) { + return true; + } + } + return false; + } + + //是否全部校验完成 + public boolean checkFinish(List myErpOrders, List vailOrders) { + for (ErpOrderEntity myErpOrder : myErpOrders) { + if (!"success".equals(myErpOrder.getStatus())) { + return false; + } + } + + for (ErpOrderEntity myErpOrder : vailOrders) { + if (!"success".equals(myErpOrder.getStatus())) { + return false; + } + } + return true; + } + + public String checkId(ErpOrderEntity vailOrderEntity, UdiRelevanceResponse udiRelevanceResponse) { + if (vailOrderEntity.getGoodsid() != null && udiRelevanceResponse != null) { + if (vailOrderEntity.getGoodsid().equals(udiRelevanceResponse.getId() + "")) + return null; + } else { + return "产品ID不匹配！"; + } + + return "产品信息未找到！"; + } + + public String checkBatchNo(ErpOrderEntity vailOrderEntity, ErpOrderEntity myErpOrder) { + if (vailOrderEntity.getGoodsid() != null && myErpOrder.getBatchNo() != null) { + if (vailOrderEntity.getBatchNo().equals(myErpOrder.getBatchNo())) + return null; + } else if (vailOrderEntity.getGoodsid() == null && myErpOrder.getBatchNo() == null) { + return null; + } else { + return myErpOrder.getCoName() + "批次号不匹配！"; + } + return "批次号不匹配！"; + } + + public String checkProductDate(ErpOrderEntity vailOrderEntity, ErpOrderEntity myErpOrder) { + if (vailOrderEntity.getProductDate() != null && myErpOrder.getProductDate() != null) { + if (vailOrderEntity.getProductDate().equals(myErpOrder.getProductDate())) + return null; + } else if (vailOrderEntity.getProductDate() == null && myErpOrder.getProductDate() == null) { + return null; + } else { + return myErpOrder.getCoName() + "生产日期不匹配！"; + } + return "生产日期不匹配！"; + } + + + public String checkExpireDate(ErpOrderEntity vailOrderEntity, ErpOrderEntity myErpOrder) { + if (vailOrderEntity.getExpireDate() != null && myErpOrder.getExpireDate() != null) { + if (vailOrderEntity.getExpireDate().equals(myErpOrder.getExpireDate())) + return null; + } else if (vailOrderEntity.getExpireDate() == null && myErpOrder.getExpireDate() == null) { + return null; + } else { + return myErpOrder.getCoName() + "失效日期不匹配！"; + } + return "失效日期不匹配！"; + } + + + public String checkWarehouse(ErpOrderEntity vailOrderEntity, ErpOrderEntity myErpOrder) { + if (vailOrderEntity.getWarehouseCode() != null && myErpOrder.getWarehouseCode() != null) { + if (vailOrderEntity.getWarehouseCode().equals(myErpOrder.getWarehouseCode())) + return null; + } else if (vailOrderEntity.getWarehouseCode() == null && myErpOrder.getWarehouseCode() == null) { + return null; + } else { + return myErpOrder.getCoName() + "仓位号不匹配！"; + } + return "仓位号不匹配！"; + } + + public String checkCount(ErpOrderEntity vailOrderEntity, ErpOrderEntity myErpOrder) { + if (vailOrderEntity.getReCount() != null && myErpOrder.getCount() != null) { + if (vailOrderEntity.getReCount() == myErpOrder.getCount()) + return null; + } + return myErpOrder.getCoName() + "数量不匹配！"; + } + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/ContrastErpUtil.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/ContrastErpUtil.java index 2da10fe..2351843 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/ContrastErpUtil.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/ContrastErpUtil.java @@ -21,6 +21,8 @@ import com.glxp.sale.admin.service.inout.OrderDetailService; import com.glxp.sale.admin.service.inout.OrderService; import com.glxp.sale.admin.thread.InvProductsTrService; import com.glxp.sale.admin.thread.IoTransInoutService; +import com.glxp.sale.admin.util.FilterUdiUtils; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -40,6 +42,10 @@ public class ContrastErpUtil { IoTransInoutService ioTransInoutService; @Resource InvProductsTrService InvProductsTrService; + @Resource + UdiRelevanceService udiRelevanceService; + @Resource + private OrderDetailService myErpOrderService; public ContrastErpUtil() { @@ -53,6 +59,7 @@ public class ContrastErpUtil { OrderDetailService orderDetailService, OrderService orderService, List warehouseEntityList, SystemParamConfigService setupService, BussinessTypeEntity bussinessTypeEntity) { + //单据详情初始化 String orderIdFk = warehouseEntityList.get(0).getOrderId(); FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest(); filterErpOrderRequest.setOrderId(orderIdFk); @@ -64,8 +71,60 @@ public class ContrastErpUtil { } String errMsg = null; String resultMsg = null; + + //获取当前订单 + OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); + orderFilterRequest.setId(orderIdFk); + OrderEntity orderEntity = orderService.findOne(orderFilterRequest); + + //校验单据详情是否有包含一个di多个绑定 + String erpMsg = vailMutiDi(); + if (erpMsg != null) { + orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL); + orderEntity.setRemark(errMsg); + orderService.updateOrder(orderEntity); + return; + } + + //校验业务单据是否被其他扫码单校验 + ErpOrderEntity vailExitMsg = vailErpExit(orderDetailService, mErpOrderEntities, orderIdFk); + SystemParamConfigRequest systemParamConfigRequest = new SystemParamConfigRequest(); + systemParamConfigRequest.setParamKey("erp_forbidSameErp"); + SystemParamConfigEntity systemParamConfigEntity = setupService.selectByParamKey(systemParamConfigRequest); + if (vailExitMsg != null && systemParamConfigEntity != null && systemParamConfigEntity.getParamValue().equals("1")) { + errMsg = "所选ERP单" + vailExitMsg.getErpOrderId() + "已被其他出入库单" + vailExitMsg.getOrderIdFk() + "绑定！"; + } + + //开始校验 List errorData = new ArrayList<>(); for (WarehouseEntity warehouseEntity : warehouseEntityList) { +// if (warehouseEntity.getCode().substring(0, 1).equals("#")) { +// UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(warehouseEntity.getNameCode()); +// if (udiRelevanceResponse != null) { +// //校验单据详情 +// errMsg = vaildOrder(warehouseEntityList, warehouseEntity, udiRelevanceResponse); +// if (errMsg != null && (errMsg.equals("产品信息不匹配") || errMsg.equals("非此单产品批次号"))) { +// errorData.add(warehouseEntity); +// } +// } else { +// errMsg = "产品信息未维护"; +// errorData.add(warehouseEntity); +// } +// +// } else { +// +// FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); +// filterUdiInfoRequest.setNameCode(warehouseEntity.getNameCode()); +// List udiRelevanceEntities = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest); +// if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && erpOrderEntity.getBindRlFk() == null) { +// erpOrderEntity.setBindStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI); +// myErpOrderService.updateErpOrder(erpOrderEntity); +// errMsg = "该产品DI绑定多个产品ID，请在扫码单据详情绑定对应产品ID"; +// } +// +// } + + UdiInfoEntity udiInfoEntity = new InoutUtils(udiUrl).getUdiInfo(udiInfoService, udiRelevanceService, warehouseEntity.getCode()); if (warehouseEntity.getCount() > 1) { udiInfoEntity.setCount(warehouseEntity.getCount()); @@ -94,17 +153,7 @@ public class ContrastErpUtil { } } - orderDetailService.insertErpOrders(mErpOrderEntities); - OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); - orderFilterRequest.setId(orderIdFk); - OrderEntity orderEntity = orderService.findOne(orderFilterRequest); - ErpOrderEntity vailExitMsg = vailErpExit(orderDetailService, mErpOrderEntities, orderIdFk); - SystemParamConfigRequest systemParamConfigRequest = new SystemParamConfigRequest(); - systemParamConfigRequest.setParamKey("erp_forbidSameErp"); - SystemParamConfigEntity systemParamConfigEntity = setupService.selectByParamKey(systemParamConfigRequest); - if (vailExitMsg != null && systemParamConfigEntity != null && systemParamConfigEntity.getParamValue().equals("1")) { - errMsg = "所选ERP单" + vailExitMsg.getErpOrderId() + "已被其他出入库单" + vailExitMsg.getOrderIdFk() + "绑定！"; - } + if (mErpOrderEntities != null && mErpOrderEntities.size() > 0) for (ErpOrderEntity erpOrderEntity : mErpOrderEntities) { if (erpOrderEntity.getErpCount() != erpOrderEntity.getCount()) { @@ -128,6 +177,97 @@ public class ContrastErpUtil { } } + //验证产品ID,批次号，仓位号 + public String vaildOrder(List warehouseEntityList, WarehouseEntity warehouseEntity) { + String errMsg = "产品信息不匹配"; + if (mErpOrderEntities.size() > 0) { + for (ErpOrderEntity erpOrderEntity : mErpOrderEntities) { + + errMsg = vailCode(erpOrderEntity, warehouseEntity,null); + if (errMsg == null) { + int erpCount = erpOrderEntity.getCount() + warehouseEntity.getCount(); + if (erpOrderEntity.getErpCount() != erpCount) { + erpOrderEntity.setCount(erpCount); + if (erpOrderEntity.getErpCount() != erpCount) + return "该" + warehouseEntity.getBatchNo() + "批次号下" + "订单数目不匹配"; + } + erpOrderEntity.setCount(erpCount); + return null; + } + } + } + if (errMsg == null && getSelectedCount(warehouseEntityList) + warehouseEntity.getCount() != erpTotalCount) { + return "订单数目匹配失败"; + } + return errMsg; + } + + public String vailMutiDi() { + String errMsg = null; + for (ErpOrderEntity erpOrderEntity : mErpOrderEntities) { + FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); + filterUdiInfoRequest.setNameCode(erpOrderEntity.getNameCode()); + List udiRelevanceEntities = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest); + if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && erpOrderEntity.getBindRlFk() == null) { + erpOrderEntity.setBindStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI); + myErpOrderService.updateErpOrder(erpOrderEntity); + errMsg = "该产品DI绑定多个产品ID，请在扫码单据详情绑定对应产品ID"; + } + } + return errMsg; + } + + public String vailCode(ErpOrderEntity erpOrderEntity, WarehouseEntity warehouseEntity, String udiRl) { + String errMsg = null; + if (erpOrderEntity.getBatchNo().equals(warehouseEntity.getBatchNo())) { + + + if (erpOrderEntity.getGoodsid().equals(udiRl)) { + if (erpOrderEntity.getWarehouseCode() != null && warehouseEntity.getWarehouseCode() != null) { + if (erpOrderEntity.getWarehouseCode().equals(warehouseEntity.getWarehouseCode())) { + return null; + } else + errMsg = "仓位号不匹配"; + } else + return null; + } else + errMsg = "产品信息不匹配"; + } else { + errMsg = "非此单产品批次号"; + } + return errMsg; + } + + + public String checkRlId(ErpOrderEntity erpOrderEntity, WarehouseEntity warehouseEntity) { + FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); + filterUdiInfoRequest.setNameCode(warehouseEntity.getNameCode()); + List udiRelevanceEntities = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest); + if (udiRelevanceEntities.size() > 1) { + for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceEntities) { + } + } + return null; + } + + public String checkBatchNo() { + return null; + } + + public String checkWarehouse() { + return null; + + } + + public String checkProduceDate() { + return null; + } + + public String checkExpireDate() { + return null; + } + + public UdiRelevanceEntity checkGoodsId(List udiRelevanceEntities, BussinessTypeEntity bussinessTypeEntity) { if (mErpOrderEntities.size() > 0) { for (ErpOrderEntity erpOrderEntity : mErpOrderEntities) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/InoutUtils.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/InoutUtils.java index f8639f6..ed64fdf 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/InoutUtils.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/InoutUtils.java @@ -10,6 +10,7 @@ import com.glxp.sale.admin.entity.inout.WarehouseEntity; import com.glxp.sale.admin.entity.udid.UdiEntity; import com.glxp.sale.admin.httpclient.UdiDlHttpClient; import com.glxp.sale.admin.req.param.SystemParamConfigRequest; +import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import com.glxp.sale.admin.service.basic.UdiInfoService; import com.glxp.sale.admin.service.basic.UdiRelevanceService; import com.glxp.sale.admin.service.param.SystemParamConfigService; @@ -17,6 +18,7 @@ import com.glxp.sale.admin.service.inout.CodesService; import com.glxp.sale.admin.service.inout.OrderDetailService; import com.glxp.sale.admin.util.DateUtil; import com.glxp.sale.admin.util.FilterUdiUtils; +import org.springframework.beans.BeanUtils; import java.util.ArrayList; import java.util.HashMap; @@ -171,19 +173,37 @@ public class InoutUtils { return udiInfoEntity; } + + public UdiInfoEntity getUdiInfoByRlId(UdiInfoService udiInfoService, UdiRelevanceService udiRelevanceService, String code) { + String prefix; + prefix = FilterUdiUtils.getDiStr(code); + UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); + UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(prefix); + BeanUtils.copyProperties(udiRelevanceResponse, udiInfoEntity); + udiInfoEntity.setCode(code); + udiInfoEntity = FilterUdiUtils.transUdi(udiInfoEntity); + udiInfoEntity.setNameCode(udiRelevanceResponse.getNameCode()); + return udiInfoEntity; + } + public void generateConstrastDetail(UdiInfoService udiInfoService, UdiRelevanceService udiRelevanceService, OrderDetailService orderDetailService, List warehouseEntityList) { if (warehouseEntityList != null && warehouseEntityList.size() > 0) { List udiInfoEntities = new ArrayList<>(); for (WarehouseEntity warehouseEntity : warehouseEntityList) { - UdiInfoEntity udiInfoEntity = getUdiInfo(udiInfoService, udiRelevanceService, warehouseEntity.getCode()); + UdiInfoEntity udiInfoEntity = null; + if (warehouseEntity.getCode().substring(0, 1).equals("#")) { + udiInfoEntity = getUdiInfoByRlId(udiInfoService, udiRelevanceService, warehouseEntity.getCode()); + } else + udiInfoEntity = getUdiInfo(udiInfoService, udiRelevanceService, warehouseEntity.getCode()); if (udiInfoEntity != null) { - if (warehouseEntity.getCount() != null) - udiInfoEntity.setCount(warehouseEntity.getCount()); - else { - udiInfoEntity.setCount(getActCount(udiInfoEntity)); - } +// if (warehouseEntity.getCount() != null) +// udiInfoEntity.setCount(warehouseEntity.getCount()); +// else { +// +// } + udiInfoEntity.setCount(getActCount(warehouseEntity, udiRelevanceService)*warehouseEntity.getCount()); udiInfoEntities.add(udiInfoEntity); } } @@ -226,14 +246,30 @@ public class InoutUtils { } } - public int getActCount(UdiInfoEntity udiInfoBean) { +// public int getActCount(UdiInfoEntity udiInfoBean) { +// if (udiInfoBean != null) { +// if (udiInfoBean.getZxxsbzbhsydysl() > 1) { +// return udiInfoBean.getZxxsbzbhsydysl() * udiInfoBean.getBhzxxsbzsl(); +// } else { +// return udiInfoBean.getBhzxxsbzsl(); +// } +// } +// return 1; +// } + + public int getActCount(WarehouseEntity warehouseEntity, UdiRelevanceService udiRelevanceService) { + UdiRelevanceResponse udiInfoBean = udiRelevanceService.selectByNameCode(warehouseEntity.getNameCode()); if (udiInfoBean != null) { - if (udiInfoBean.getZxxsbzbhsydysl() > 1) { - return udiInfoBean.getZxxsbzbhsydysl() * udiInfoBean.getBhzxxsbzsl(); + 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; } } 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 a4fea55..00c84c1 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 @@ -168,6 +168,12 @@ public class ThrOrderImportLogController { } for (int k = sheet.getFirstRowNum()+1; k <= sheet.getLastRowNum(); k++) { row = sheet.getRow(k); + if (row == null || row.getRowNum() <= 0) { + continue; + } + if (filterEmpty(row)) { + continue; + } ThrOrderImportDetailEntity corpImportDetailEntity = new ThrOrderImportDetailEntity(); Cell cell1 = row.getCell(0); if (cell1 != null) { @@ -282,5 +288,44 @@ public class ThrOrderImportLogController { } return ResultVOUtils.success("上传成功"); } + public boolean filterEmpty(Row row) { + if (row.getCell(0) != null) { + row.getCell(0).setCellType(CellType.STRING); + } + if (row.getCell(1) != null) { + row.getCell(1).setCellType(CellType.STRING); + } + if (row.getCell(2) != null) { + row.getCell(2).setCellType(CellType.STRING); + } + if (row.getCell(3) != null) { + row.getCell(3).setCellType(CellType.STRING); + } + if (row.getCell(4) != null) { + row.getCell(4).setCellType(CellType.STRING); + } + if (row.getCell(5) != null) { + row.getCell(5).setCellType(CellType.STRING); + } + if (row.getCell(6) != null) { + row.getCell(6).setCellType(CellType.STRING); + } + 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(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) && + ("".equals(row.getCell(0).getStringCellValue()) + && "".equals(row.getCell(1).getStringCellValue()) + && "".equals(row.getCell(2).getStringCellValue()) + && "".equals(row.getCell(3).getStringCellValue()) + && "".equals(row.getCell(4).getStringCellValue()) + && "".equals(row.getCell(5).getStringCellValue()) + && "".equals(row.getCell(6).getStringCellValue())) + )) { + return true; + } + return false; + } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsImportLogController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsImportLogController.java index 8baf443..48db25d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsImportLogController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsImportLogController.java @@ -143,7 +143,10 @@ public class ThrProductsImportLogController { } for (int k = sheet.getFirstRowNum(); k <= sheet.getLastRowNum(); k++) { row = sheet.getRow(k); - if (row == null || row.getFirstCellNum() == k) { + if (row == null || row.getRowNum() <= 0) { + continue; + } + if (filterEmpty(row)) { continue; } ErpProductsResponse erpProductsResponse = new ErpProductsResponse(); @@ -192,4 +195,44 @@ public class ThrProductsImportLogController { } return ResultVOUtils.success("上传成功"); } + public boolean filterEmpty(Row row) { + + if (row.getCell(0) != null) { + row.getCell(0).setCellType(CellType.STRING); + } + if (row.getCell(1) != null) { + row.getCell(1).setCellType(CellType.STRING); + } + if (row.getCell(2) != null) { + row.getCell(2).setCellType(CellType.STRING); + } + if (row.getCell(3) != null) { + row.getCell(3).setCellType(CellType.STRING); + } + if (row.getCell(4) != null) { + row.getCell(4).setCellType(CellType.STRING); + } + if (row.getCell(5) != null) { + row.getCell(5).setCellType(CellType.STRING); + } + if (row.getCell(6) != null) { + row.getCell(6).setCellType(CellType.STRING); + } + 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(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) && + ("".equals(row.getCell(0).getStringCellValue()) + && "".equals(row.getCell(1).getStringCellValue()) + && "".equals(row.getCell(2).getStringCellValue()) + && "".equals(row.getCell(3).getStringCellValue()) + && "".equals(row.getCell(4).getStringCellValue()) + && "".equals(row.getCell(5).getStringCellValue()) + && "".equals(row.getCell(6).getStringCellValue())) + )) { + return true; + } + return false; + } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/AuthAdminDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/AuthAdminDao.java index 008e99c..8222727 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/AuthAdminDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/AuthAdminDao.java @@ -4,6 +4,7 @@ import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.auth.UpdateUserflagBean; import com.glxp.sale.admin.req.auth.AuthAdminQueryRequest; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -12,12 +13,14 @@ public interface AuthAdminDao { /** * 后台业务查询列表 + * * @return 列表 */ List listAdminPage(AuthAdminQueryRequest authAdminQueryRequest); /** * 根据id查询 + * * @param id 传入的id * @return */ @@ -25,6 +28,7 @@ public interface AuthAdminDao { /** * 根据id查询 password + * * @param id 传入的id * @return */ @@ -32,13 +36,18 @@ public interface AuthAdminDao { /** * 根据Name + * * @param userName 用户名 * @return */ AuthAdmin findByUserName(String userName); + AuthAdmin findByUser(@Param("userName") String userName,@Param("CustomerId") String CustomerId); + + /** * 插入 + * * @param authAdmin * @return */ @@ -46,6 +55,7 @@ public interface AuthAdminDao { /** * 更新 + * * @param authAdmin * @return */ @@ -53,6 +63,7 @@ public interface AuthAdminDao { /** * 删除 + * * @param id * @return */ diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessLocalTypeDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessLocalTypeDao.java index 663c204..334265a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessLocalTypeDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessLocalTypeDao.java @@ -20,5 +20,7 @@ public interface BussinessLocalTypeDao { boolean updateBusLocalType(BussinessLocalTypeEntity bussinessTypeEntity); + boolean insertBussinessType(BussinessLocalTypeEntity bussinessTypeEntity); + boolean deleteById(@Param("id") String id); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/ErpOrderEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/ErpOrderEntity.java index 6193ecf..e1c0b8c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/ErpOrderEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/ErpOrderEntity.java @@ -55,6 +55,14 @@ public class ErpOrderEntity { private String status; private Integer count; private Integer bindStatus; + + + public Integer getBindStatus() { + if (bindStatus == null) + return 0; + return bindStatus; + } + private String bindRlFk; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java index 1c544d2..cad4ce4 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java @@ -21,6 +21,7 @@ public class OrderEntity { private Integer signStatus; private String stockCheckFk; private String remark; + private int receiveStatus; private String customerId; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/httpclient/ErpOrderClient.java b/api-admin/src/main/java/com/glxp/sale/admin/httpclient/ErpOrderClient.java index ebc0424..8bc27a6 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/httpclient/ErpOrderClient.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/httpclient/ErpOrderClient.java @@ -96,8 +96,8 @@ public class ErpOrderClient { erpOrderEntity.setBatchNo(subPurchase.getBatchNo()); erpOrderEntity.setProductDate(subPurchase.getProductDate()); erpOrderEntity.setExpireDate(subPurchase.getExpireDate()); - erpOrderEntity.setErpCount(Math.abs(subPurchase.getCount())); - erpOrderEntity.setReCount(Math.abs(subPurchase.getReCount())); + erpOrderEntity.setErpCount(Math.abs(Integer.parseInt(subPurchase.getCount()))); + erpOrderEntity.setReCount(Math.abs(Integer.parseInt(subPurchase.getReCount()))); erpOrderEntity.setGoodsunit(subPurchase.getSpec()); erpOrderEntities.add(erpOrderEntity); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/auth/LoginRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/LoginRequest.java index a4376ed..b837a35 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/auth/LoginRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/LoginRequest.java @@ -16,4 +16,6 @@ public class LoginRequest { @NotEmpty(message = "密码不能为空") private String password; + private Integer type; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/OrderFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/OrderFilterRequest.java index 8bc62ff..9d2ad50 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/OrderFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/OrderFilterRequest.java @@ -19,7 +19,7 @@ public class OrderFilterRequest extends ListPageRequest { private String startTime; private String endTime; private String stockCheckFk; - + private Integer receiveStatus; private Integer statusOrOne; private String customerId; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/UpdateExportStatusRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/UpdateExportStatusRequest.java index 66733a5..e25cae0 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/UpdateExportStatusRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/UpdateExportStatusRequest.java @@ -7,5 +7,6 @@ public class UpdateExportStatusRequest { private String orderId; private Integer exportStatus; + private Integer checkStatus; } 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 b535c9c..015b606 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 @@ -48,8 +48,15 @@ public class UdiRelevanceResponse { private Boolean isDisable; private String erpId; private String erpName; - + private Integer productType; private Boolean isSelect; private Boolean isLock; + + public int getBhzxxsbzsl() { + if (bhzxxsbzsl == null || bhzxxsbzsl == 0) { + return 1; + } else + return bhzxxsbzsl; + } } 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 40f953a..9391e7f 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 @@ -111,8 +111,8 @@ public class ErpOrderResponse { private String batchNo; private String expireDate; private String productDate; - private int count; //账面数量 - private int reCount; //实际数量 + private String count; //账面数量 + private String reCount; //实际数量 private String sweepCount; private String ylqxzcrbarmc; private String zczbhhzbapzbh; @@ -165,19 +165,19 @@ public class ErpOrderResponse { this.productDate = productDate; } - public int getCount() { + public String getCount() { return count; } - public void setCount(int count) { + public void setCount(String count) { this.count = count; } - public int getReCount() { + public String getReCount() { return reCount; } - public void setReCount(int reCount) { + public void setReCount(String reCount) { this.reCount = reCount; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthAdminService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthAdminService.java index 20a5f20..df63f19 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthAdminService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/AuthAdminService.java @@ -13,6 +13,7 @@ public interface AuthAdminService { AuthAdmin findByUserName(String userName); + AuthAdmin findByUser(String userName, String CustomerId); AuthAdmin findById(Long id); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthAdminServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthAdminServiceImpl.java index f83fd5b..9f1e77e 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthAdminServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthAdminServiceImpl.java @@ -36,8 +36,14 @@ public class AuthAdminServiceImpl implements AuthAdminService { return authAdminDao.findByUserName(userName); } + @Override + public AuthAdmin findByUser(String userName, String CustomerId) { + return authAdminDao.findByUser(userName, CustomerId); + } + /** * 根据id 获取需要的info + * * @param id * @return */ @@ -48,6 +54,7 @@ public class AuthAdminServiceImpl implements AuthAdminService { /** * 根据 id 获取密码字段 + * * @param id * @return */ @@ -58,6 +65,7 @@ public class AuthAdminServiceImpl implements AuthAdminService { /** * 新增 + * * @param authAdmin * @return */ @@ -76,6 +84,7 @@ public class AuthAdminServiceImpl implements AuthAdminService { /** * 更新 + * * @param authAdmin * @return */ @@ -99,6 +108,7 @@ public class AuthAdminServiceImpl implements AuthAdminService { /** * 根据id删除 + * * @param id * @return */ diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessLocalTypeService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessLocalTypeService.java index 18bd886..28f81cc 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessLocalTypeService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessLocalTypeService.java @@ -17,6 +17,8 @@ public interface BussinessLocalTypeService { BussinessLocalTypeEntity findBTByName(String name); + boolean insertBussinessType(BussinessLocalTypeEntity bussinessLocalTypeEntity); + boolean updateBusLocalType(BussinessLocalTypeEntity bussinessTypeEntity); boolean deleteById(String id); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiRelevanceService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiRelevanceService.java index c278782..b97f276 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiRelevanceService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiRelevanceService.java @@ -13,6 +13,8 @@ public interface UdiRelevanceService { List filterUdiEntity(FilterUdiInfoRequest filterUdiInfoRequest); + UdiRelevanceResponse selectByNameCode(String nameCode); + boolean isExit(); List filterUdiGp(FilterUdiInfoRequest filterUdiInfoRequest); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java index 7bbd249..1dfcd7b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java @@ -65,6 +65,11 @@ public class BussinessLocalTypeServiceImpl implements BussinessLocalTypeService return null; } + @Override + public boolean insertBussinessType(BussinessLocalTypeEntity bussinessLocalTypeEntity) { + return bussinessLocalTypeDao.insertBussinessType(bussinessLocalTypeEntity); + } + @Override public boolean updateBusLocalType(BussinessLocalTypeEntity bussinessTypeEntity) { return bussinessLocalTypeDao.updateBusLocalType(bussinessTypeEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java index 4061bc5..bdfe192 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java @@ -42,6 +42,16 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService { return data; } + @Override + public UdiRelevanceResponse selectByNameCode(String nameCode) { + FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); + filterUdiInfoRequest.setNameCode(nameCode); + List udiRelevanceResponses = filterUdiRelevance(filterUdiInfoRequest); + if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) + return udiRelevanceResponses.get(0); + return null; + } + @Override public boolean isExit() { FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/StockOrderService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/StockOrderService.java index 648d6ba..b7c3f43 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/StockOrderService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/StockOrderService.java @@ -30,6 +30,9 @@ public interface StockOrderService { StockOrderEntity findOne(StockOrderFilterRequest stockOrderFilterRequest); StockOrderEntity findById(String orderId); - + + StockOrderEntity findByBillNo(String orderId); + + List listOrderPrint(String orderId); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderServiceImpl.java index 5c1bc73..661ddec 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderServiceImpl.java @@ -94,6 +94,14 @@ public class StockOrderServiceImpl implements StockOrderService { return stockOrderDao.findOne(stockOrderFilterRequest); } + @Override + public StockOrderEntity findByBillNo(String orderId) { + StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest(); + stockOrderFilterRequest.setBillNo(orderId); + return stockOrderDao.findOne(stockOrderFilterRequest); + } + + @Override public List listOrderPrint(String orderId) { StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest(); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrDataService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrDataService.java index 939aa2d..c309f0f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrDataService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrDataService.java @@ -95,8 +95,21 @@ public class ThrDataService { if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) { for (StockOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { ErpOrderEntity erpOrderResponse = new ErpOrderEntity(); - BeanUtils.copyProperties(thrOrderEntity, erpOrderResponse); - BeanUtils.copyProperties(thrOrderDetailEntity, erpOrderResponse); + erpOrderResponse.setCredate(thrOrderEntity.getBilldate()); + erpOrderResponse.setCompanyid(thrOrderEntity.getCorpId()); + erpOrderResponse.setCompanyname(thrOrderEntity.getCorpName()); + erpOrderResponse.setCoName(thrOrderDetailEntity.getProductName()); + erpOrderResponse.setGoodsname(thrOrderDetailEntity.getProductName()); + erpOrderResponse.setGoodsid(thrOrderDetailEntity.getProductId()); + erpOrderResponse.setBatchNo(thrOrderDetailEntity.getBatchNo()); + erpOrderResponse.setProductDate(thrOrderDetailEntity.getProductDate()); + erpOrderResponse.setExpireDate(thrOrderDetailEntity.getExpireDate()); + erpOrderResponse.setReCount(Integer.parseInt(thrOrderDetailEntity.getReCount())); + erpOrderResponse.setErpCount(Integer.parseInt(thrOrderDetailEntity.getCount())); + erpOrderResponse.setAuthCode(thrOrderDetailEntity.getZczbhhzbapzbh()); + erpOrderResponse.setProductCompany(thrOrderDetailEntity.getYlqxzcrbarmc()); + erpOrderResponse.setPackSpec(thrOrderDetailEntity.getSpec()); + erpOrderResponse.setGoodsunit(thrOrderDetailEntity.getSpec()); erpOrderEntities.add(erpOrderResponse); } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicGenExcelService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicGenExcelService.java index 3a5edb9..b626c00 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicGenExcelService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicGenExcelService.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.thread; import com.glxp.sale.admin.constant.BasicProcessStatus; +import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.constant.UdiInfoImportStatus; import com.glxp.sale.admin.entity.basic.*; import com.glxp.sale.admin.req.basic.*; @@ -253,7 +254,10 @@ public class BasicGenExcelService { List udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest); for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) { List rows = new ArrayList<>(); - rows.add(udiRelevanceResponse.getNameCode()); + if (udiRelevanceResponse.getProductType() == ConstantStatus.PRODUCT_TYPE_THIRD) + rows.add(null); + else + rows.add(udiRelevanceResponse.getNameCode()); rows.add(udiRelevanceResponse.getYbbm()); rows.add(udiRelevanceResponse.getSptm()); rows.add(udiRelevanceResponse.getThirdId()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java index 10101cf..b2a21b0 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java @@ -65,20 +65,7 @@ public class InvProductsTrService { String nameCode = erpOrderEntity.getNameCode(); String erpId = erpOrderEntity.getGoodsid(); FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); - filterUdiInfoRequest.setNameCode(nameCode); - - if (bussinessTypeEntity.getThirdSysFk().equals("thirdId")) { - filterUdiInfoRequest.setThirdId(erpId); - } else if (bussinessTypeEntity.getThirdSysFk().equals("thirdId1")) { - filterUdiInfoRequest.setThirdId1(erpId); - } else if (bussinessTypeEntity.getThirdSysFk().equals("thirdId2")) { - filterUdiInfoRequest.setThirdId2(erpId); - } else if (bussinessTypeEntity.getThirdSysFk().equals("thirdId3")) { - filterUdiInfoRequest.setThirdId3(erpId); - } else if (bussinessTypeEntity.getThirdSysFk().equals("thirdId4")) { - filterUdiInfoRequest.setThirdId4(erpId); - } - + filterUdiInfoRequest.setId(erpId); List udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest); String relId = null; if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java index 86a21c8..7f7de7a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java @@ -222,15 +222,21 @@ public class IoTransInoutService { WarehouseQueryRequest tempQuery = new WarehouseQueryRequest(); tempQuery.setOrderId(orderEntity.getId()); List temps = codesTempService.findByOrderId(tempQuery); - if (orderEntity.getErpFk() != null && !"".equals(orderEntity.getErpFk())) { - orderService.updateOrderStatus(orderEntity.getId(), ConstantStatus.ORDER_STATUS_CHECK); - } else { - //因为只需用到条码，所以不需要重新读取 - new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, insertList); - orderService.updateOrderStatus(orderEntity.getId(), ConstantStatus.ORDER_STATUS_SUCCESS); - invProductsTrService.genInvProducts(orderEntity.getId()); - printOrder(orderEntity.getId()); - } + + //todo 改成等待校验，选择校验 + genOrderDetail(insertList); +// new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, insertList); + orderService.updateOrderStatus(orderEntity.getId(), ConstantStatus.ORDER_STATUS_CHECK); + checkMutiDi(orderEntity.getId()); +// if (orderEntity.getErpFk() != null && !"".equals(orderEntity.getErpFk())) { +// orderService.updateOrderStatus(orderEntity.getId(), ConstantStatus.ORDER_STATUS_CHECK); +// } else { +// //因为只需用到条码，所以不需要重新读取 +// new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, insertList); +// orderService.updateOrderStatus(orderEntity.getId(), ConstantStatus.ORDER_STATUS_SUCCESS); +// invProductsTrService.genInvProducts(orderEntity.getId()); +// printOrder(orderEntity.getId()); +// } List ids = new ArrayList<>(); for (WarehouseEntity w : temps) { @@ -241,6 +247,35 @@ public class IoTransInoutService { } } + public void genOrderDetail(List warehouseEntityList) { + new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, warehouseEntityList); + } + + public void checkMutiDi(String orderId) { + //校验是否di绑定多个产品ID + OrderEntity orderEntity = orderService.findById(orderId); + FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest(); + filterErpOrderRequest.setOrderId(orderId); + List erpOrderEntities = myErpOrderService.filterAllMyErpOrder(filterErpOrderRequest); + if (erpOrderEntities != null && erpOrderEntities.size() > 0) { + for (ErpOrderEntity erpOrderEntity : erpOrderEntities) { + + FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); + filterUdiInfoRequest.setNameCode(erpOrderEntity.getNameCode()); + List udiRelevanceEntities = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest); + if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && erpOrderEntity.getBindRlFk() == null) { + erpOrderEntity.setBindStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI); + myErpOrderService.updateErpOrder(erpOrderEntity); + orderEntity.setRemark("该产品DI绑定多个产品ID，请在扫码单据详情绑定对应产品ID"); + orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL); + orderService.updateOrder(orderEntity); + } + + } + } + } + + //校验ERP单 @Async public void checkOrder() { @@ -280,6 +315,8 @@ public class IoTransInoutService { printOrder(orderEntity.getId()); invProductsTrService.genInvProducts(orderEntity.getId()); } + + } public void checkThirdOrder(List cloudErps, OrderEntity orderEntity, List transData) { diff --git a/api-admin/src/main/resources/application-pro.properties b/api-admin/src/main/resources/application-pro.properties index 201e30f..22282e1 100644 --- a/api-admin/src/main/resources/application-pro.properties +++ b/api-admin/src/main/resources/application-pro.properties @@ -6,8 +6,8 @@ spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms?serverTimezone=Asia/ spring.datasource.username=root #spring.datasource.password=root spring.datasource.password=123456 -server.servlet.context-path= -logging.level.com.glxp.sale.admin.dao=debug +#server.servlet.context-path= +#logging.level.com.glxp.sale.admin.dao=debug # \u8DE8\u57DF\u8BBE\u7F6E cors.allowed-origins=* cors.allowed-headers=Content-Type,ADMIN_ID,ADMIN_TOKEN diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml index 05cc367..4b2e9d2 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml @@ -3,7 +3,8 @@ - SELECT * FROM auth_user @@ -21,7 +22,7 @@ - AND CustomerId = #{CustomerId} + AND CustomerId = #{CustomerId} ORDER BY id @@ -34,6 +35,21 @@ userName = #{userName} + + LIMIT 1 + + + + @@ -105,7 +121,9 @@ - delete from auth_user where id = #{id} + delete + from auth_user + where id = #{id} \ No newline at end of file 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 a2b9ee3..7c40601 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml @@ -54,7 +54,7 @@ #{action}, #{name}, #{enable}, - #{remark}, + #{remark} ) 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 c2df4f9..c5e586d 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -19,7 +19,7 @@ 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.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 @@ -78,16 +78,16 @@ AND nameCode LIKE concat(#{nameCode},'%') - or nameCode LIKE concat('%',#{unionCode},'%') - or basic_udirel.ybbm LIKE concat('%',#{unionCode},'%') - or basic_udirel.sptm LIKE concat('%',#{unionCode},'%') + or nameCode LIKE concat('%',#{unionCode},'%') + or basic_udirel.ybbm LIKE concat('%',#{unionCode},'%') + or basic_udirel.sptm LIKE concat('%',#{unionCode},'%') - or thirdId LIKE concat('%',#{thrPiId},'%') - or thirdId1 LIKE concat('%',#{thrPiId},'%') - or thirdId2 LIKE concat('%',#{thrPiId},'%') - or thirdId3 LIKE concat('%',#{thrPiId},'%') - or thirdId4 LIKE concat('%',#{thrPiId},'%') + or thirdId LIKE concat('%',#{thrPiId},'%') + or thirdId1 LIKE concat('%',#{thrPiId},'%') + or thirdId2 LIKE concat('%',#{thrPiId},'%') + or thirdId3 LIKE concat('%',#{thrPiId},'%') + or thirdId4 LIKE concat('%',#{thrPiId},'%') AND uuid = #{uuid} @@ -103,33 +103,33 @@ AND (thirdId ]]> '' or thirdId1 ]]> '' or thirdId2 ]]> '' or - thirdId3 ]]> '' or thirdId4 ]]> '' ) + thirdId3 ]]> '' or thirdId4 ]]> '' ) and basic_products.flbm ]]> '' AND basic_products.flbm is NULL - AND thirdId is NULL and basic_products.flbm ]]> '' + AND thirdId is NULL and basic_products.flbm ]]> '' - AND thirdId1 is NULL and basic_products.flbm ]]> '' + AND thirdId1 is NULL and basic_products.flbm ]]> '' - AND thirdId2 is NULL and basic_products.flbm ]]> '' + AND thirdId2 is NULL and basic_products.flbm ]]> '' - AND thirdId3 is NULL and basic_products.flbm ]]> '' + AND thirdId3 is NULL and basic_products.flbm ]]> '' - AND thirdId4 is NULL and basic_products.flbm ]]> '' + AND thirdId4 is NULL and basic_products.flbm ]]> '' ORDER BY updateTime DESC - + - select * FROM basic_udirel WHERE id = #{id} + select * + FROM basic_udirel + WHERE id = #{id} - - replace INTO basic_udirel + + replace + INTO basic_udirel ( thirdId,thirdName,uuid,isUseDy,updateTime, thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock ) values ( - #{thirdId}, - #{thirdName}, - #{uuid}, - #{isUseDy}, - #{updateTime}, - #{thirdId1}, #{thirdId2}, #{thirdId3}, #{thirdId4}, - #{thirdName1}, #{thirdName2}, #{thirdName3}, #{thirdName4}, - #{manufactory}, #{measname},#{ybbm},#{sptm},#{isDisable},#{isLock} - ) + #{thirdId}, + #{thirdName}, + #{uuid}, + #{isUseDy}, + #{updateTime}, + #{thirdId1}, + #{thirdId2}, + #{thirdId3}, + #{thirdId4}, + #{thirdName1}, + #{thirdName2}, + #{thirdName3}, + #{thirdName4}, + #{manufactory}, + #{measname}, + #{ybbm}, + #{sptm}, + #{isDisable}, + #{isLock} + ) - DELETE FROM basic_udirel WHERE id = #{id} + DELETE + FROM basic_udirel + WHERE id = #{id} DELETE FROM basic_udirel WHERE id in @@ -226,7 +243,9 @@ - DELETE FROM basic_udirel WHERE uuid = #{uuid} + DELETE + FROM basic_udirel + WHERE uuid = #{uuid} 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 936094e..d176275 100644 --- a/api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml @@ -36,9 +36,9 @@ 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 - FROM (company_product_relevance + FROM company_product_relevance inner JOIN basic_udirel - ON company_product_relevance.udiRlIdFk = basic_udirel.id) + ON company_product_relevance.udiRlIdFk = basic_udirel.id inner JOIN basic_products ON basic_udirel.uuid = basic_products.uuid diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml index 2186d13..097cc3d 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml @@ -27,7 +27,9 @@ and nameCode =#{nameCode} - + + and orderId =#{orderId} + ORDER BY actDate diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml index 36240ac..6fd32a0 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -31,7 +31,8 @@ insert INTO io_order(id, action, corpOrderId, actDate, fromCorpId, actor, mainAction, - fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus, erpFk, stockCheckFk, customerId) + fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus, + receiveStatus,erpFk, stockCheckFk, customerId) values (#{id}, #{action}, #{corpOrderId}, @@ -46,13 +47,14 @@ #{fromType}, #{contrastStatus}, #{signStatus}, + #{receiveStatus}, #{erpFk}, #{stockCheckFk}, #{customerId}) UPDATE io_order - + action=#{action}, corpOrderId=#{corpOrderId}, actDate=#{actDate}, @@ -66,9 +68,10 @@ fromType=#{fromType}, contrastStatus=#{contrastStatus}, erpFk=#{erpFk}, - signStatus=#{signStatus} - stockCheckFk=#{stockCheckFk} - + signStatus=#{signStatus}, + receiveStatus=#{receiveStatus}, + stockCheckFk=#{stockCheckFk}, + WHERE id = #{id}