From b6dfe40c5a515b6ae23aa52b52ed47215cba1c8e Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Thu, 12 May 2022 16:02:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=91=BD=E5=90=8D=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/sale/admin/constant/Constant.java | 6 - .../controller/auth/LoginController.java | 1 - .../basic/BussinessLocalTypeController.java | 2 +- .../basic/BussinessTypeController.java | 4 +- .../basic/SpsSyncUploadController.java | 5 + .../basic/UdiContrastController.java | 31 +++-- .../basic/UdiRelevanceController.java | 2 + .../controller/inout/OrderController.java | 1 - .../inout/OrderDetailController.java | 11 +- .../inout/StockOrderController.java | 25 ++-- .../inout/StockOrderDetailController.java | 2 +- .../inout/StockQRCodeTextController.java | 12 +- .../controller/inout/WareHouseController.java | 11 +- .../inout/utils/CheckOrderUtils.java | 2 - .../inout/utils/ContrastErpUtil.java | 16 --- .../inventory/InvPreProductsController.java | 8 +- .../inventory/InvProductsController.java | 11 +- .../param/SystemPDFTemplateController.java | 14 --- .../thrsys/ThrOrderReceiveController.java | 10 -- .../impl/UdiInfoImportDetailServiceImpl.java | 3 + .../service/inout/impl/OrderServiceImpl.java | 10 +- .../admin/service/thrsys/ThrDataService.java | 1 + .../thrsys/impl/ThrCorpServiceImpl.java | 1 + .../admin/thread/BasicCorpImportService.java | 1 + .../admin/thread/InvProductsTrService.java | 118 +++++++----------- .../admin/thread/IoTransInoutService.java | 87 +++---------- .../admin/thread/ThrOrderImportService.java | 1 + .../thread/ThrProductsImportService.java | 1 + .../sale/admin/thread/UdiDlHttpClient.java | 19 +++ .../com/glxp/sale/admin/util/Constant.java | 4 + .../glxp/sale/admin/util/FilterUdiUtils.java | 4 + .../main/resources/application-pro.properties | 4 +- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 19 +-- .../info/CompanyProductRelevanceDao.xml | 12 +- 34 files changed, 193 insertions(+), 266 deletions(-) delete mode 100644 api-admin/src/main/java/com/glxp/sale/admin/constant/Constant.java 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 deleted file mode 100644 index 245fa01..0000000 --- a/api-admin/src/main/java/com/glxp/sale/admin/constant/Constant.java +++ /dev/null @@ -1,6 +0,0 @@ -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/LoginController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java index 835b134..4319e61 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 @@ -2,7 +2,6 @@ package com.glxp.sale.admin.controller.auth; import cn.hutool.core.util.StrUtil; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; -import com.glxp.sale.admin.constant.Constant; import com.glxp.sale.admin.dao.auth.AuthLicenseDao; import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.auth.AuthLicense; 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 3fe2a75..dfbdfca 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 @@ -3,7 +3,6 @@ package com.glxp.sale.admin.controller.basic; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; 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.basic.BussinessChangeTypeEntity; import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity; @@ -21,6 +20,7 @@ import com.glxp.sale.admin.service.basic.BussinessChangeTypeService; import com.glxp.sale.admin.service.basic.BussinessLocalTypeService; import com.glxp.sale.admin.service.basic.BussinessTypeService; import com.glxp.sale.admin.service.inout.StockOrderService; +import com.glxp.sale.admin.util.Constant; import com.glxp.sale.admin.util.CustomUtil; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java index 0ab6065..ae18ba7 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java @@ -4,7 +4,6 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; -import com.glxp.sale.admin.constant.Constant; import com.glxp.sale.admin.constant.ConstantType; import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity; @@ -22,12 +21,12 @@ import com.glxp.sale.admin.service.auth.CustomerService; import com.glxp.sale.admin.service.basic.BussinessLocalTypeService; import com.glxp.sale.admin.service.basic.BussinessTypeService; import com.glxp.sale.admin.service.inout.OrderService; +import com.glxp.sale.admin.util.Constant; import com.glxp.sale.admin.util.CustomUtil; import com.glxp.sale.admin.util.FileUtils; 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.validation.BindingResult; import org.springframework.web.bind.annotation.*; import org.springframework.web.context.request.RequestContextHolder; @@ -39,7 +38,6 @@ import javax.servlet.http.HttpServletRequest; import java.io.InputStream; import java.util.Date; import java.util.List; -import java.util.stream.Collectors; /** * 业务类型维护 diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java index 096b725..5d3a4ad 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java @@ -228,6 +228,8 @@ public class SpsSyncUploadController { } catch (Exception e) { } } +// batchSession.clearCache(); + batchSession.close(); } @@ -272,6 +274,7 @@ public class SpsSyncUploadController { } catch (Exception e) { } } + batchSession.close(); } @@ -313,5 +316,7 @@ public class SpsSyncUploadController { } catch (Exception e) { } } + + batchSession.close(); } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java index 80a3697..f4f023c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java @@ -138,9 +138,13 @@ public class UdiContrastController { return ResultVOUtils.error(500, "已存在相同的对照关系，无法切换版本"); } List udiInfoEntities = udiDlHttpClient.getUdiByUuid(combineRequest.getKeys().get(0)); - udiInfoService.insertUdiInfos(udiInfoEntities); + udiInfoService.deleteByUuid(udiRelevanceEntity.getUuid()); - udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid()); + for (UdiInfoEntity udiInfoEntity : udiInfoEntities) { + udiInfoEntity.setUuid(udiRelevanceEntity.getUuid()); + } + udiInfoService.insertUdiInfos(udiInfoEntities); +// udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid()); udiRelevanceEntity.setUpdateTime(DateUtil.formatDateTime(new Date())); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); return ResultVOUtils.success("切换成功！"); @@ -240,9 +244,7 @@ public class UdiContrastController { productInfoEntityList.addAll(result); } } - } - PageInfo pageInfo; pageInfo = new PageInfo<>(productInfoEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -253,7 +255,7 @@ public class UdiContrastController { } public void createUnionContrast(CombineRequest combineRequest, String key) { - List udiInfoEntities = udiDlHttpClient.getUdiByUuid(key); + List udiInfoEntities = udiDlHttpClient.getOrUpdateByUuid(key); UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); udiRelevanceEntity.setThirdId(combineRequest.getThirdId()); udiRelevanceEntity.setThirdName(combineRequest.getErpName()); @@ -267,18 +269,18 @@ public class UdiContrastController { udiRelevanceEntity.setManufactory(udiInfoEntities.get(0).getYlqxzcrbarmc()); udiRelevanceEntity.setSupName(combineRequest.getSupName()); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); - udiInfoService.insertUdiInfos(udiInfoEntities); + insertUdiInfos(udiInfoEntities); } public void createOnlyUuid(CombineRequest combineRequest, String key) { - List udiInfoEntities = udiDlHttpClient.getUdiByUuid(key); + List udiInfoEntities = udiDlHttpClient.getOrUpdateByUuid(key); UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid()); udiRelevanceEntity.setManufactory(udiInfoEntities.get(0).getYlqxzcrbarmc()); udiRelevanceEntity.setSupName(combineRequest.getSupName()); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); - udiInfoService.insertUdiInfos(udiInfoEntities); + insertUdiInfos(udiInfoEntities); } public void createOnlyMainId(CombineRequest combineRequest, String mainId) { @@ -311,12 +313,12 @@ public class UdiContrastController { } public void updateDi(UdiRelevanceEntity udiRelevanceEntity, String key) { - List udiInfoEntities = udiDlHttpClient.getUdiByUuid(key); + List udiInfoEntities = udiDlHttpClient.getOrUpdateByUuid(key); udiInfoService.deleteByUuid(udiRelevanceEntity.getUuid()); udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid()); udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); - udiInfoService.insertUdiInfos(udiInfoEntities); + insertUdiInfos(udiInfoEntities); } @@ -365,5 +367,14 @@ public class UdiContrastController { return udiRelevanceEntity; } + public void insertUdiInfos(List udiInfoEntities) { + if (CollUtil.isNotEmpty(udiInfoEntities)) { + UdiInfoEntity udiInfoEntity = udiInfoService.findByUuid(udiInfoEntities.get(0).getUuid()); + if (udiInfoEntity == null) { + udiInfoService.insertUdiInfos(udiInfoEntities); + } + } + } + } 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 e15fc9f..da70ac9 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 @@ -472,11 +472,13 @@ public class UdiRelevanceController { filterSysEntityList.add(new FilterSysEntity(0, "全部")); filterSysEntityList.add(new FilterSysEntity(1, "对照完成")); filterSysEntityList.add(new FilterSysEntity(2, "未对照DI")); + if (basicThirdSysEntities != null && basicThirdSysEntities.size() > 0) { for (int i = 0; i < basicThirdSysEntities.size(); i++) { filterSysEntityList.add(new FilterSysEntity(i + 3, "未对照" + basicThirdSysEntities.get(i).getThirdName())); } } + filterSysEntityList.add(new FilterSysEntity(10, "最新同步")); PageInfo pageInfo; pageInfo = new PageInfo<>(filterSysEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); 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 8aa219d..a457b85 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 @@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; -import com.glxp.sale.admin.constant.Constant; import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.controller.inout.utils.DataTransUtil; import com.glxp.sale.admin.entity.auth.AuthAdmin; 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 aa7be3c..355d113 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 @@ -1,5 +1,6 @@ package com.glxp.sale.admin.controller.inout; +import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.ConstantStatus; @@ -162,12 +163,18 @@ public class OrderDetailController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(filterErpOrderRequest.getBillAction()); + String billType = null; + if(StrUtil.isNotEmpty(filterErpOrderRequest.getBillAction())){ + BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(filterErpOrderRequest.getBillAction()); + billType = bussinessTypeEntity.getLocalAction(); + }else { + billType = filterErpOrderRequest.getLocalAction(); + } StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest(); stockOrderFilterRequest.setBillNo(filterErpOrderRequest.getBillNo()); stockOrderFilterRequest.setStartTime(filterErpOrderRequest.getStartDate()); stockOrderFilterRequest.setEndTime(filterErpOrderRequest.getEndDate()); - stockOrderFilterRequest.setBillType(bussinessTypeEntity.getLocalAction()); + stockOrderFilterRequest.setBillType(billType); stockOrderFilterRequest.setPage(filterErpOrderRequest.getPage()); stockOrderFilterRequest.setStatus(ConstantStatus.SORDER_CHECK); stockOrderFilterRequest.setLimit(filterErpOrderRequest.getLimit()); 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 6f88b84..69e5b77 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 @@ -5,13 +5,9 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; -import com.glxp.sale.admin.constant.Constant; import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.entity.auth.AuthAdmin; -import com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity; -import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity; -import com.glxp.sale.admin.entity.basic.StockPrintEntity; -import com.glxp.sale.admin.entity.basic.StockPrinttREntity; +import com.glxp.sale.admin.entity.basic.*; import com.glxp.sale.admin.entity.info.CompanyEntity; import com.glxp.sale.admin.entity.inout.*; import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; @@ -26,10 +22,7 @@ import com.glxp.sale.admin.res.inout.ErpOrderResponse; import com.glxp.sale.admin.res.inout.StockOrderResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; import com.glxp.sale.admin.service.auth.CustomerService; -import com.glxp.sale.admin.service.basic.BasicUnitMaintainService; -import com.glxp.sale.admin.service.basic.BussinessLocalTypeService; -import com.glxp.sale.admin.service.basic.UdiInfoService; -import com.glxp.sale.admin.service.basic.UdiRelevanceService; +import com.glxp.sale.admin.service.basic.*; import com.glxp.sale.admin.service.info.CompanyService; import com.glxp.sale.admin.service.inout.*; import com.glxp.sale.admin.service.inventory.InvStockPrintService; @@ -40,10 +33,7 @@ import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import org.springframework.web.context.request.RequestContextHolder; @@ -71,14 +61,10 @@ public class StockOrderController { @Resource private StockQRCodeTextService stockQRCodeTextService; @Resource - private UdiInfoService udiInfoService; - @Resource private UdiRelevanceService udiRelevanceService; @Resource private SystemParamConfigService systemParamConfigService; - @Value("${STOCK_PRINT_POST}") - private String stpUrl; @Resource private AuthAdminService authAdminService; @Resource @@ -99,6 +85,8 @@ public class StockOrderController { WarehouseUserService warehouseUserService; @Resource GennerOrderUtils gennerOrderUtils; + @Resource + private BussinessTypeService bussinessTypeService; @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/order/error") @@ -380,7 +368,6 @@ public class StockOrderController { return ResultVOUtils.success(); } - @AuthRuleAnnotation("") @PostMapping("/udiwms/stock/order/change") public BaseResponse stockOrderChange(@RequestBody AddStockOrderChangeRequest addStockOrderChangeRequest) { @@ -399,7 +386,9 @@ public class StockOrderController { originOrder.setReceiveStatus(0); //设置验收状态为未验收 originOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); originOrder.setLocStorageCode(addStockOrderChangeRequest.getLocStorageCode()); - String supplementOrderNo = "SM" + CustomUtil.getId(); + BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(originOrder.getAction()); + String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + MyStrUtil.trim(bussinessTypeEntity.getPrefix()), "yyyyMMdd")); + String supplementOrderNo = orderNo; originOrder.setId(supplementOrderNo); List supplementCodes = new ArrayList<>(); 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 370bf92..c1d5da0 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 @@ -2,7 +2,6 @@ package com.glxp.sale.admin.controller.inout; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; -import com.glxp.sale.admin.constant.Constant; import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity; @@ -34,6 +33,7 @@ import com.glxp.sale.admin.service.inout.StockOrderDetailTempService; import com.glxp.sale.admin.service.inout.StockQRCodeTextService; import com.glxp.sale.admin.service.param.SystemParamConfigService; import com.glxp.sale.admin.thread.IoTransInoutService; +import com.glxp.sale.admin.util.Constant; import com.glxp.sale.admin.util.FilterUdiUtils; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; 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 89c111e..34ad041 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 @@ -2,8 +2,6 @@ package com.glxp.sale.admin.controller.inout; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; -import com.glxp.sale.admin.constant.Constant; -import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity; import com.glxp.sale.admin.entity.basic.StockPrintEntity; import com.glxp.sale.admin.entity.info.CompanyEntity; import com.glxp.sale.admin.entity.inout.StockOrderDetailEntity; @@ -35,6 +33,7 @@ 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.thread.JaspaperService; +import com.glxp.sale.admin.util.Constant; import com.glxp.sale.admin.util.CustomUtil; import com.glxp.sale.admin.util.JasperUtils; import com.glxp.sale.common.enums.ResultEnum; @@ -388,21 +387,12 @@ public class StockQRCodeTextController { for (StockOrderPrintEntity stockOrderPrintEntity : list) { stockOrderPrintEntity.setIndex(index + ""); stockOrderPrintEntity.setTitle(companyEntity.getCompanyName()); -// StockOrderPrintResponse stockOrderPrintResponse = new StockOrderPrintResponse(); -// BeanUtils.copyProperties(stockOrderPrintEntity, stockOrderPrintResponse); -// stockOrderPrintResponse.setPrice(stockOrderPrintEntity.getPrice()); -// stockOrderPrintResponse.setTotalPrice(stockOrderPrintEntity.getTotalPrice()); -// stockOrderPrintEntity.setAmount(BigDecimal.valueOf(85.36)); -// stockOrderPrintEntity.setTotalPrice(BigDecimal.valueOf(1888.88)); -// stockOrderPrintEntity.setTotalPriceWord("18888"); stockOrderPrintEntity.setCorpName(stockOrderPrintEntity.getCorpName()); -// stockOrderPrintEntity.setLocInv(stockOrderPrintEntity.getLocInv()); stockOrderPrintEntity.setOrderName(stockQRCodeTextPDFTemplateRequest.getOrderName()); stockOrderPrintEntity.setRemark1(systemPDFModuleEntity.getRemark1()); stockOrderPrintEntity.setRemark2(systemPDFModuleEntity.getRemark2()); stockOrderPrintEntity.setRemark3(systemPDFModuleEntity.getRemark3()); index++; -// stockOrderPrintResponses.add(stockOrderPrintResponse); } Map data = new HashMap(); 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 f880432..78e4225 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 @@ -341,6 +341,15 @@ public class WareHouseController { if (udiEntity == null) return ResultVOUtils.error(500, "无效条码！"); + if (StrUtil.isNotEmpty(udiEntity.getSerialNo()) && udiEntity.getSerialNo().length() > 20) { + return ResultVOUtils.error(500, "无效条码！序列号超出最大范围"); + } + + if (StrUtil.isNotEmpty(udiEntity.getBatchNo()) && udiEntity.getBatchNo().length() > 20) { + return ResultVOUtils.error(500, "无效条码！批次号超出最大范围"); + } + + //批次号校验 if (StrUtil.isEmpty(udiEntity.getSerialNo()) && StrUtil.isEmpty(udiEntity.getBatchNo())) { return ResultVOUtils.error(500, "批次号不能为空！"); @@ -402,7 +411,7 @@ public class WareHouseController { //先生成扫码单据 OrderEntity orderEntity = orderService.findById(orderId); if (StringUtils.isBlank(orderId) || orderEntity == null) { - String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean("MS" + MyStrUtil.trim(bussinessTypeEntity.getPrefix()), "yyyyMMdd")); + String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + MyStrUtil.trim(bussinessTypeEntity.getPrefix()), "yyyyMMdd")); orderId = orderNo; } 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 index d5af8c1..5bf39ca 100644 --- 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 @@ -1,8 +1,6 @@ package com.glxp.sale.admin.controller.inout.utils; import cn.hutool.core.util.StrUtil; -import cn.hutool.db.sql.Order; -import com.glxp.sale.admin.constant.Constant; import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; import com.glxp.sale.admin.entity.inout.*; 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 616b7a7..a911796 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 @@ -1,30 +1,14 @@ package com.glxp.sale.admin.controller.inout.utils; -import com.glxp.sale.admin.constant.Constant; -import com.glxp.sale.admin.constant.ConstantStatus; -import com.glxp.sale.admin.entity.basic.BasicInstrumentMaintainRelevanceEntity; -import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; import com.glxp.sale.admin.entity.basic.UdiInfoEntity; -import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; -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.req.basic.FilterUdiInfoRequest; -import com.glxp.sale.admin.req.inout.OrderFilterRequest; -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; 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.thread.UdiDlHttpClient; -import com.glxp.sale.admin.util.FilterUdiUtils; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreProductsController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreProductsController.java index 5b2354a..476d392 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreProductsController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreProductsController.java @@ -20,6 +20,7 @@ import com.glxp.sale.admin.service.info.CompanyService; import com.glxp.sale.admin.service.inventory.InvPreProductDetailService; import com.glxp.sale.admin.service.inventory.InvPreProductService; import com.glxp.sale.admin.service.inventory.InvWarehouseService; +import com.glxp.sale.admin.util.Constant; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; @@ -34,7 +35,6 @@ import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; -import static com.glxp.sale.admin.constant.Constant.SYSTEM_CUSTOMER_ID; @RestController public class InvPreProductsController { @@ -44,14 +44,12 @@ public class InvPreProductsController { InvPreProductDetailService invProductDetailService; @Resource private CompanyService companyService; - @Resource - private InvWarehouseService invWarehouseService; @AuthRuleAnnotation("") @GetMapping("spms/pre/inv/products/filter") public BaseResponse filterInvProduct(FilterInvProductRequest filterInvProductRequest) { boolean showSup = false; - if (SYSTEM_CUSTOMER_ID.equals(filterInvProductRequest.getCustomerId())) { + if (Constant.SYSTEM_CUSTOMER_ID.equals(filterInvProductRequest.getCustomerId())) { filterInvProductRequest.setCustomerId(null); showSup = true; } else { @@ -73,7 +71,7 @@ public class InvPreProductsController { @AuthRuleAnnotation("") @GetMapping("spms/pre/inv/products/filterDetail") public BaseResponse filterInvProductDetail(FilterInvProductDetailRequest filterInvProductRequest) { - if (SYSTEM_CUSTOMER_ID.equals(filterInvProductRequest.getCustomerId())) { + if (Constant.SYSTEM_CUSTOMER_ID.equals(filterInvProductRequest.getCustomerId())) { filterInvProductRequest.setCustomerId(null); // filterInvProductRequest.setSupId(); } 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 d567deb..da04bbe 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 @@ -33,6 +33,7 @@ import com.glxp.sale.admin.service.inout.WarehouseUserService; import com.glxp.sale.admin.service.inventory.InvProductDetailService; import com.glxp.sale.admin.service.inventory.InvProductService; import com.glxp.sale.admin.service.inventory.InvWarehouseService; +import com.glxp.sale.admin.util.Constant; import com.glxp.sale.admin.util.FilterUdiUtils; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; @@ -50,7 +51,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static com.glxp.sale.admin.constant.Constant.SYSTEM_CUSTOMER_ID; + @RestController public class InvProductsController { @@ -83,7 +84,7 @@ public class InvProductsController { filterInvProductRequest.setNameCode(FilterUdiUtils.getDiStr(filterInvProductRequest.getUdiCode())); } - if (SYSTEM_CUSTOMER_ID.equals(customerId)) { + if (Constant.SYSTEM_CUSTOMER_ID.equals(customerId)) { filterInvProductRequest.setCustomerId(null); showSup = true; if (StrUtil.isEmpty(filterInvProductRequest.getInvStorageCode())) { @@ -131,7 +132,7 @@ public class InvProductsController { @AuthRuleAnnotation("") @GetMapping("spms/inv/products/filterDetail") public BaseResponse filterInvProductDetail(FilterInvProductDetailRequest filterInvProductRequest) { - if (SYSTEM_CUSTOMER_ID.equals(filterInvProductRequest.getCustomerId())) { + if (Constant.SYSTEM_CUSTOMER_ID.equals(filterInvProductRequest.getCustomerId())) { filterInvProductRequest.setCustomerId(null); } // filterInvProductRequest.setSupId(null); @@ -191,7 +192,7 @@ public class InvProductsController { String customerId = customerService.getCustomerId() + ""; - if (SYSTEM_CUSTOMER_ID.equals(customerId)) { + if (Constant.SYSTEM_CUSTOMER_ID.equals(customerId)) { filterInvProductDetailRequest.setCustomerId(null); if (StrUtil.isEmpty(filterInvProductDetailRequest.getInvStorageCode())) { List warehouseUserEntities = warehouseUserService.selectCodeByUser(customerService.getUserId() + ""); @@ -348,7 +349,7 @@ public class InvProductsController { @GetMapping("/spms/inv/products/stockStatistics") public BaseResponse stockStatistics(FilterInvProductRequest filterInvProductRequest) { boolean showSup = false; - if (SYSTEM_CUSTOMER_ID.equals(filterInvProductRequest.getCustomerId())) { + if (Constant.SYSTEM_CUSTOMER_ID.equals(filterInvProductRequest.getCustomerId())) { filterInvProductRequest.setCustomerId(null); if (StrUtil.isEmpty(filterInvProductRequest.getInvStorageCode())) { List warehouseUserEntities = warehouseUserService.selectCodeByUser(customerService.getUserId() + ""); 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 8ecab6f..2a1b4b2 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 @@ -2,21 +2,10 @@ package com.glxp.sale.admin.controller.param; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; -import com.glxp.sale.admin.constant.Constant; -import com.glxp.sale.admin.entity.auth.AuthRole; -import com.glxp.sale.admin.entity.info.CompanyEntity; -import com.glxp.sale.admin.entity.inout.StockOrderEntity; -import com.glxp.sale.admin.entity.inout.StockOrderPrintEntity; -import com.glxp.sale.admin.entity.param.SystemPDFModuleEntity; import com.glxp.sale.admin.entity.param.SystemPDFTemplateEntity; -import com.glxp.sale.admin.req.info.DeleteRequest; -import com.glxp.sale.admin.req.itextpdf.StockQRCodeTextPDFTemplateRequest; -import com.glxp.sale.admin.req.itextpdf.SystemPDFTemplateRelevanceRequest; import com.glxp.sale.admin.req.param.SystemPDFTemplateRequest; import com.glxp.sale.admin.req.param.SystemPDFTemplateSaveRequest; import com.glxp.sale.admin.res.PageSimpleResponse; -import com.glxp.sale.admin.res.auth.AuthAdminRoleResponse; -import com.glxp.sale.admin.res.param.SystemPDFTemplateRelevanceResponse; import com.glxp.sale.admin.res.param.SystemPDFTemplateResponse; import com.glxp.sale.admin.res.param.SystemPDFTemplateSelectResponse; import com.glxp.sale.admin.service.param.SystemPDFTemplateService; @@ -34,11 +23,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.File; -import java.io.IOException; import java.util.Date; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; @RestController diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderReceiveController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderReceiveController.java index 84b2ce0..d751827 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderReceiveController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderReceiveController.java @@ -2,24 +2,14 @@ package com.glxp.sale.admin.controller.thrsys; //领用单 import com.glxp.sale.admin.annotation.AuthRuleAnnotation; -import com.glxp.sale.admin.constant.Constant; -import com.glxp.sale.admin.constant.ConstantStatus; -import com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity; -import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity; -import com.glxp.sale.admin.entity.info.CompanyEntity; import com.glxp.sale.admin.entity.inout.StockOrderDetailEntity; -import com.glxp.sale.admin.entity.inout.StockOrderEntity; -import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.entity.thrsys.ThrOrderDetailEntity; import com.glxp.sale.admin.entity.thrsys.ThrOrderEntity; -import com.glxp.sale.admin.req.inout.StockOrderFilterRequest; import com.glxp.sale.admin.req.inout.StockOrderPostRequest; import com.glxp.sale.admin.service.auth.CustomerService; import com.glxp.sale.admin.service.thrsys.ThrOrderDetailService; import com.glxp.sale.admin.service.thrsys.ThrOrderService; -import com.glxp.sale.admin.util.CustomUtil; import com.glxp.sale.admin.util.DateUtil; -import com.glxp.sale.admin.util.StockOrderBillNoUtils; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java index c4118c3..108b647 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java @@ -107,6 +107,7 @@ public class UdiInfoImportDetailServiceImpl implements UdiInfoImportDetailServic } catch (Exception e) { } } + batchSession.close(); } //关联表导入 @@ -121,6 +122,7 @@ public class UdiInfoImportDetailServiceImpl implements UdiInfoImportDetailServic batchSession.commit(); } catch (Exception e) { } + batchSession.close(); } //第三方产品信息导入 @@ -136,6 +138,7 @@ public class UdiInfoImportDetailServiceImpl implements UdiInfoImportDetailServic batchSession.commit(); } catch (Exception e) { } + batchSession.close(); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java index c7d8f9b..4d03d4b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java @@ -18,8 +18,7 @@ import com.glxp.sale.admin.req.inout.OrderQueryRequest; import com.glxp.sale.admin.res.inout.StockOrderResponse; import com.glxp.sale.admin.service.inout.OrderService; import com.glxp.sale.admin.service.param.SystemParamConfigService; -import com.glxp.sale.admin.util.CustomUtil; -import com.glxp.sale.admin.util.DateUtil; +import com.glxp.sale.admin.util.*; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; @@ -51,6 +50,8 @@ public class OrderServiceImpl implements OrderService { CodesTempDao codesTempDao; @Resource SystemParamConfigService systemParamConfigService; + @Resource + GennerOrderUtils gennerOrderUtils; @Override public List listOrders(OrderQueryRequest orderQueryRequest) { @@ -210,7 +211,8 @@ public class OrderServiceImpl implements OrderService { OrderEntity supplementOrder = new OrderEntity(); BeanUtil.copyProperties(order, supplementOrder); //生成补单单号 - String supplementOrderNo = "SM" + CustomUtil.getId(); + String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + MyStrUtil.trim(bussinessTypeEntity.getPrefix()), "yyyyMMdd")); + String supplementOrderNo = orderNo; supplementOrder.setSupplementNo(order.getId()); supplementOrder.setId(supplementOrderNo); @@ -226,7 +228,7 @@ public class OrderServiceImpl implements OrderService { supplementOrder.setExportStatus(0); //设置导出状态为未导出 supplementOrder.setContrastStatus(0);//设置erp校验状态为未校验 supplementOrder.setReceiveStatus(0); //设置验收状态为未验收 - supplementOrder.setCorpOrderId(CustomUtil.getId()+"x"); + supplementOrder.setCorpOrderId(CustomUtil.getId() + "x"); //修改往来单位及当前库存号 supplementOrder.setFromCorpId(order.getLocStorageCode()); supplementOrder.setLocStorageCode(order.getFromCorpId()); 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 57710f8..35ec969 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 @@ -121,6 +121,7 @@ public class ThrDataService { erpOrderResponse.setSecSalesInvNo(thrOrderDetailEntity.getSecSalesInvNo()); erpOrderResponse.setInvoiceDate(thrOrderDetailEntity.getInvoiceDate()); erpOrderResponse.setFirstSalesInvNo(thrOrderDetailEntity.getFirstSalesInvNo()); + erpOrderResponse.setBindRlFk(thrOrderDetailEntity.getRelId()); erpOrderEntities.add(erpOrderResponse); } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrCorpServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrCorpServiceImpl.java index 6583054..38efcbb 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrCorpServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrCorpServiceImpl.java @@ -84,5 +84,6 @@ public class ThrCorpServiceImpl implements ThrCorpService { } catch (Exception e) { } } + batchSession.close(); } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicCorpImportService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicCorpImportService.java index 6dd3c77..49277c9 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicCorpImportService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicCorpImportService.java @@ -99,6 +99,7 @@ public class BasicCorpImportService { log.error("导入第三方往来单位数据失败", e); } } + batchSession.close(); } } 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 41ec62e..78b7f83 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 @@ -1,11 +1,9 @@ package com.glxp.sale.admin.thread; import cn.hutool.core.util.StrUtil; -import com.glxp.sale.admin.constant.Constant; import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.constant.ConstantType; import com.glxp.sale.admin.entity.basic.*; -import com.glxp.sale.admin.entity.info.CompanyEntity; import com.glxp.sale.admin.entity.inout.*; import com.glxp.sale.admin.entity.inventory.InvProductDetailEntity; import com.glxp.sale.admin.entity.inventory.InvProductEntity; @@ -14,27 +12,19 @@ import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.entity.udid.UdiEntity; import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest; import com.glxp.sale.admin.req.inventory.FilterInvProductDetailRequest; -import com.glxp.sale.admin.res.basic.BussinessTypResponse; import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import com.glxp.sale.admin.res.inventory.InvProductDetailJoinResponse; import com.glxp.sale.admin.service.basic.*; -import com.glxp.sale.admin.service.info.CompanyService; import com.glxp.sale.admin.service.inout.*; import com.glxp.sale.admin.service.inventory.*; import com.glxp.sale.admin.service.param.SystemParamConfigService; -import com.glxp.sale.admin.util.CustomUtil; -import com.glxp.sale.admin.util.DateUtil; -import com.glxp.sale.admin.util.FilterUdiUtils; -import org.apache.ibatis.annotations.Param; -import org.apache.regexp.RE; +import com.glxp.sale.admin.util.*; import org.springframework.beans.BeanUtils; -import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.*; -import java.util.stream.Collectors; @Service public class InvProductsTrService { @@ -68,18 +58,14 @@ public class InvProductsTrService { private BussinessChangeTypeService bussinessChangeTypeService; @Resource private BasicUnitMaintainService basicUnitMaintainService; - - @Resource - @Lazy - private IoTransInoutService ioTransInoutService; - @Resource - CompanyService companyService; @Resource SystemParamConfigService systemParamConfigService; @Resource IOOrderStatusService ioOrderStatusService; @Resource InvWarehouseService invWarehouseService; + @Resource + GennerOrderUtils gennerOrderUtils; @Async public void genInvProducts(String orderId) { @@ -178,26 +164,19 @@ public class InvProductsTrService { if (orderEntity.isOutChangeEnable()) {//是否缺量补单 //普通出库 if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction()) && !bussinessTypeEntity.isAdvanceType()) { - //补采购入库或寄售转入单 -// List datas = addOutOrder(orderEntity, mInvProductDetailEntities);//1.先计算现有库存， -// List temps = filterMapCodes(datas); - addUseOutOrder(orderEntity, mInvProductDetailEntities, bussinessChangeTypeEntitys); - } else if (ConstantType.TYPE_PUT.equals(bussinessTypeEntity.getMainAction()) && !bussinessTypeEntity.isAdvanceType()) //普通入库补单 { BussinessChangeTypeEntity bussinessChangeTypeEntity = bussinessChangeTypeEntitys.get(0); List datas = addPutOrder(orderEntity, mInvProductDetailEntities); List temps = filterMapCodes(datas); -// insetInv(bussinessTypeEntity.isAdvanceType(), mInvProductDetailEntities);//2.插入当前库存 buildPreOutOrder(bussinessChangeTypeEntity, temps, orderEntity); //3.生成流转单据 } else if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction()) && bussinessTypeEntity.isAdvanceType()) { //寄售出库补单 BussinessChangeTypeEntity bussinessChangeTypeEntity = bussinessChangeTypeEntitys.get(0); List datas = addPreOutOrder(orderEntity, mInvProductDetailEntities); List temps = filterMapCodes(datas); -// insetInv(bussinessTypeEntity.isAdvanceType(), mInvProductDetailEntities);//2.插入当前库存 buildPreInOrder(bussinessChangeTypeEntity, temps, orderEntity); //3.生成流转单据 } else { insetInv(bussinessTypeEntity.isAdvanceType(), mInvProductDetailEntities);//2.插入当前库存 @@ -213,7 +192,7 @@ public class InvProductsTrService { } - //普通出库补单-- //补采购入库或寄售转入单 + //普通出库补单-- //补采购入库，调拨入库，寄售转入 public void addUseOutOrder(OrderEntity orderEntity, List invProductDetailEntities, List bussinessChangeTypeEntities) { BussinessChangeTypeEntity advChangeTypeEntity = null; @@ -235,9 +214,33 @@ public class InvProductsTrService { //缺量补单时是否全量补单 SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("ullage_supplement_all"); if (systemParamConfigEntity != null && systemParamConfigEntity.getParamValue().equals("1")) { - for (WarehouseEntity warehouseEntity : warehouseEntities) { - inList.add(warehouseEntity); + WarehouseEntity warehouseEntity = warehouseEntities.get(0); + InvWarehouseEntity locWarehouseEntity = invWarehouseService.selectByCode(warehouseEntity.getLocStorageCode()); + if (locWarehouseEntity.getLevel() == 1 && isAdavnce(warehouseEntity)) {//补寄售转入 + for (WarehouseEntity tempEntity : warehouseEntities) { + preiInList.add(tempEntity); + } + } else { + if (locWarehouseEntity.getLevel() > 1) { + norChangeTypeEntity = innorChangeTypeEntity; + InvWarehouseEntity pInWarehouseEntity = invWarehouseService.selectByCode(locWarehouseEntity.getPcode()); + for (WarehouseEntity tempEntity : warehouseEntities) { + tempEntity.setFromCorp(pInWarehouseEntity.getName()); + tempEntity.setFromCorpId(pInWarehouseEntity.getCode()); + inList.add(tempEntity); + } + } else { + norChangeTypeEntity = outChangeTypeEntity; + BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByErpId(warehouseEntity.getSupId()); + for (WarehouseEntity tempEntity : warehouseEntities) { + tempEntity.setFromCorpId(warehouseEntity.getSupId()); + tempEntity.setFromCorp(basicUnitMaintainEntity.getName()); + inList.add(tempEntity); + } + } } + + } else { for (WarehouseEntity warehouseEntity : warehouseEntities) { /** @@ -248,13 +251,10 @@ public class InvProductsTrService { * {可能需要补录的入库单据有一种：《调拨入库》} */ InvWarehouseEntity locWarehouseEntity = invWarehouseService.selectByCode(warehouseEntity.getLocStorageCode()); - if (locWarehouseEntity.getLevel() == 1 && isAdavnce(warehouseEntity)) {//补寄售转入 - //获取当前条码实际数量 int actCount = getActCount(warehouseEntity); int count = 0; - UdiInfoEntity udiInfoEntity = getMinDi(warehouseEntity); String code = warehouseEntity.getCode(); count = actCount * warehouseEntity.getCount(); /** @@ -289,7 +289,6 @@ public class InvProductsTrService { } } } else { //结余数量《=0直接补 -// warehouseEntity.setCount(count); preiInList.add(warehouseEntity); } InvProductDetailEntity invProductDetailEntity = filterInvByCode(invProductDetailEntities, warehouseEntity.getCode()); @@ -298,18 +297,8 @@ public class InvProductsTrService { } else { int actCount = getActCount(warehouseEntity); - UdiInfoEntity udiInfoEntity = getMinDi(warehouseEntity); String code = warehouseEntity.getCode(); int count = actCount * warehouseEntity.getCount(); -// if (udiInfoEntity.getDiType() == ConstantStatus.DITYPE_PACK || udiInfoEntity.getDiType() == ConstantStatus.DITYPE_SYDY -// || (udiInfoEntity.getSjcpbm() != null && !"".equals(udiInfoEntity.getSjcpbm()))) { -// warehouseEntity.setNameCode(udiInfoEntity.getNameCode()); -// code = FilterUdiUtils.transGlxpNoSerStr(warehouseEntity); -// count = actCount * warehouseEntity.getCount(); -// } else { -// count = warehouseEntity.getCount(); -// } - int invCount = 0; if (locWarehouseEntity.getLevel() > 1) {//补调拨入库 /** @@ -320,10 +309,6 @@ public class InvProductsTrService { warehouseEntity.setFromCorpId(pInWarehouseEntity.getCode()); invCount = getCountByOrder(null, warehouseEntity); -// invCount = getCountByOrder(null, warehouseEntity.getCode(), warehouseEntity.getSupId(), locWarehouseEntity.getPcode()); -// if (invCount <= 0) { -// invCount = getCountByOrder(null, code, warehouseEntity.getSupId(), locWarehouseEntity.getPcode()); -// } norChangeTypeEntity = innorChangeTypeEntity; } else { //补供应商入库 /** @@ -334,11 +319,6 @@ public class InvProductsTrService { BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByErpId(warehouseEntity.getSupId()); warehouseEntity.setFromCorp(basicUnitMaintainEntity.getName()); invCount = getCountByOrder(null, warehouseEntity); - -// invCount = getCountByOrder(null, warehouseEntity.getCode(), warehouseEntity.getSupId(), null); -// if (invCount <= 0) { -// invCount = getCountByOrder(null, code, warehouseEntity.getSupId(), null); -// } norChangeTypeEntity = outChangeTypeEntity; } @@ -354,19 +334,8 @@ public class InvProductsTrService { } } } else { //结余数量《=0直接补 -// warehouseEntity.setCount(count); inList.add(warehouseEntity); } -// if (invCount > 0) { -// if (count > invCount) { -// int lea = count - invCount; -// warehouseEntity.setCount(lea / getActCount(warehouseEntity)); -// inList.add(warehouseEntity); -// } -// } else { -// warehouseEntity.setCount(count); -// inList.add(warehouseEntity); -// } InvProductDetailEntity invProductDetailEntity = filterInvByCode(invProductDetailEntities, warehouseEntity.getCode()); insetInvSingle(false, invProductDetailEntity); warehouseEntity.setCode(code); @@ -491,11 +460,12 @@ public class InvProductsTrService { } else { outOrder.setStatus(ConstantStatus.ORDER_STATUS_ADDITIONAL); } - outOrder.setContrastStatus(ConstantStatus.ORDER_CHECK_UN); outOrder.setErpFk(null); outOrder.setCustomerId(Constant.SYSTEM_CUSTOMER_ID); - outOrder.setId("SM" + CustomUtil.getId()); + BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(bussinessChangeTypeEntity.getScAction()); + String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + MyStrUtil.trim(bussinessTypeEntity.getPrefix()), "yyyyMMdd")); + outOrder.setId(orderNo); outOrder.setCorpOrderId(CustomUtil.getId() + "x"); outOrder.setFromCorp(invWarehouseEntity.getName()); outOrder.setFromCorpId(invWarehouseEntity.getCode()); @@ -541,6 +511,9 @@ public class InvProductsTrService { unkonwCorpList.add(warehouseEntity); } + + BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(bussinessChangeTypeEntity.getScAction()); + //有供应商生成采购入库单据 for (String corpName : filterSupMaps.keySet()) { List temps; @@ -561,7 +534,8 @@ public class InvProductsTrService { outOrder.setContrastStatus(ConstantStatus.ORDER_CHECK_UN); outOrder.setErpFk(null); outOrder.setFromType(ConstantStatus.FROM_CHANGE); - outOrder.setId("SM" + CustomUtil.getId()); + String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + MyStrUtil.trim(bussinessTypeEntity.getPrefix()), "yyyyMMdd")); + outOrder.setId(orderNo); BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByErpId(corpName); outOrder.setFromCorp(basicUnitMaintainEntity.getName()); outOrder.setFromCorpId(corpName); @@ -605,7 +579,8 @@ public class InvProductsTrService { outOrder.setContrastStatus(ConstantStatus.ORDER_CHECK_UN); outOrder.setRemark("未选择供应商"); outOrder.setErpFk(null); - outOrder.setId("SM" + CustomUtil.getId()); + String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + MyStrUtil.trim(bussinessTypeEntity.getPrefix()), "yyyyMMdd")); + outOrder.setId(orderNo); outOrder.setFromCorp(null); outOrder.setCustomerId(Constant.SYSTEM_CUSTOMER_ID); outOrder.setFromCorpId(null); @@ -653,7 +628,7 @@ public class InvProductsTrService { } else unkonwCorpList.add(warehouseEntity); } - + BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(bussinessChangeTypeEntity.getScAction()); //根据往来单位生成入库单 for (String corpName : filterSupMaps.keySet()) { List temps; @@ -668,7 +643,8 @@ public class InvProductsTrService { outOrder.setCustomerId(Constant.SYSTEM_CUSTOMER_ID); outOrder.setErpFk(null); outOrder.setFromType(ConstantStatus.FROM_CHANGE); - outOrder.setId("SM" + CustomUtil.getId()); + String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + MyStrUtil.trim(bussinessTypeEntity.getPrefix()), "yyyyMMdd")); + outOrder.setId(orderNo); outOrder.setFromCorpId(corpName); outOrder.setFromCorp(temps.get(0).getFromCorp()); outOrder.setCorpOrderId(CustomUtil.getId() + "x"); @@ -725,7 +701,7 @@ public class InvProductsTrService { } else unkonwCorpList.add(warehouseEntity); } - + BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(bussinessChangeTypeEntity.getScAction()); //有供应商生成采购入库单据 for (String corpName : filterSupMaps.keySet()) { List temps; @@ -748,10 +724,8 @@ public class InvProductsTrService { outOrder.setLocStorageCode(orderEntity.getLocStorageCode()); outOrder.setErpFk(null); outOrder.setFromType(ConstantStatus.FROM_CHANGE); - outOrder.setId("SM" + CustomUtil.getId()); -// BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByErpId(corpName); -// outOrder.setFromCorp(basicUnitMaintainEntity.getName()); -// outOrder.setFromCorpId(corpName); + String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + MyStrUtil.trim(bussinessTypeEntity.getPrefix()), "yyyyMMdd")); + outOrder.setId(orderNo); SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("additional_auto_submit"); if ("1".equals(systemParamConfigEntity.getParamValue())) { outOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); 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 c86d662..f888e01 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 @@ -3,32 +3,22 @@ package com.glxp.sale.admin.thread; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.glxp.sale.admin.config.WebSocketServer; -import com.glxp.sale.admin.constant.Constant; import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.constant.ConstantType; 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.controller.inout.utils.InoutUtils; import com.glxp.sale.admin.dao.inout.UdimsOrderDetailDao; -import com.glxp.sale.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity; import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; -import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.entity.info.CompanyEntity; import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; import com.glxp.sale.admin.entity.inout.*; -import com.glxp.sale.admin.entity.inventory.InvProductDetailEntity; import com.glxp.sale.admin.entity.inventory.InvProductEntity; import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; -import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.entity.udid.UdiEntity; -import com.glxp.sale.admin.httpclient.ErpOrderClient; import com.glxp.sale.admin.req.basic.CompanyProductRelevanceRequest; -import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest; import com.glxp.sale.admin.req.info.FilterCompanyProductRelevanceRequest; import com.glxp.sale.admin.req.inout.*; -import com.glxp.sale.admin.req.inventory.FilterInvProductDetailRequest; import com.glxp.sale.admin.req.inventory.FilterInvProductRequest; import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest; import com.glxp.sale.admin.res.basic.CompanyProductRelevanceResponse; @@ -41,29 +31,18 @@ import com.glxp.sale.admin.service.info.CompanyProductRelevanceService; import com.glxp.sale.admin.service.info.CompanyService; import com.glxp.sale.admin.service.inout.*; import com.glxp.sale.admin.service.inventory.InvPreProductService; -import com.glxp.sale.admin.service.inventory.InvProductDetailService; import com.glxp.sale.admin.service.inventory.InvProductService; import com.glxp.sale.admin.service.inventory.InvWarehouseService; -import com.glxp.sale.admin.service.param.SystemParamConfigService; -import com.glxp.sale.admin.service.thrsys.ThrDataService; -import com.glxp.sale.admin.service.thrsys.ThrOrderService; -import com.glxp.sale.admin.util.CustomUtil; -import com.glxp.sale.admin.util.DateUtil; -import com.glxp.sale.admin.util.FilterUdiUtils; -import com.glxp.sale.common.util.ResultVOUtils; +import com.glxp.sale.admin.util.*; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.text.ParseException; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -89,13 +68,9 @@ public class IoTransInoutService { @Resource private CodesTempService codesTempService; - @Autowired - private SystemParamConfigService systemParamConfigService; @Resource private BussinessTypeService bussinessTypeService; @Resource - ThrDataService thrDataService; - @Resource StockOrderService stockOrderService; @Resource StockOrderDetailService stockOrderDetailService; @@ -110,8 +85,6 @@ public class IoTransInoutService { @Resource InvWarehouseService invWarehouseService; @Resource - private CheckOrderUtils checkOrderUtils; - @Resource InvProductService invProductService; @Resource InvPreProductService invPreProductService; @@ -119,6 +92,8 @@ public class IoTransInoutService { UdiDlHttpClient udiDlHttpClient; @Resource UdimsOrderDetailDao udimsOrderDetailDao; + @Resource + GennerOrderUtils gennerOrderUtils; //web端新增订单， @Async @@ -134,7 +109,10 @@ public class IoTransInoutService { myErpOrderService.deleteByOrderId(postOrderRequest.getOldOrderId()); } WarehouseEntity warehouseEntity = warehouseEntityList.get(0); - String orderId = "SM" + CustomUtil.getId(); + + BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(warehouseEntity.getAction()); + String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + MyStrUtil.trim(bussinessTypeEntity.getPrefix()), "yyyyMMdd")); + String orderId = orderNo; OrderEntity orderSaveRequest = new OrderEntity(); orderSaveRequest.setId(orderId); if (warehouseEntity.getActDate() != null) { @@ -193,9 +171,10 @@ public class IoTransInoutService { UdiEntity udiEntity = FilterUdiUtils.getUdi(temp.getCode()); temp.setNameCode(udiEntity.getUdi()); } - WarehouseEntity warehouseEntity = warehouseEntityList.get(0); - String orderId = "SM" + CustomUtil.getId() + i + ""; + BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(warehouseEntity.getAction()); + String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + MyStrUtil.trim(bussinessTypeEntity.getPrefix()), "yyyyMMdd")); + String orderId = orderNo; OrderEntity orderSaveRequest = new OrderEntity(); orderSaveRequest.setId(orderId); @@ -251,15 +230,14 @@ public class IoTransInoutService { for (PostUdimsOrderRequest.OrderBean orderBean : orderBeans) { OrderEntity orderEntity = new OrderEntity(); - String orderId = "SM" + - CustomUtil.getId() + ""; + + BeanUtils.copyProperties(orderBean, orderEntity); orderEntity.setCorpOrderId(orderBean.getOrderId()); orderEntity.setFromCorpId(companyEntity.getUnitIdFk()); orderEntity.setFromCorp(companyEntity.getCompanyName()); orderEntity.setFromType(ConstantStatus.FROM_UDIMS); orderEntity.setReceiveStatus(0); - orderEntity.setId(orderId); orderEntity.setCreateUser(postUdimsOrderRequest.getUserId()); orderEntity.setMainAction(ConstantType.TYPE_PUT); orderEntity.setActDate(DateUtil.formatDateTime(new Date())); @@ -272,6 +250,11 @@ public class IoTransInoutService { orderEntity.setLocStorageCode(invWarehouseEntity.getCode()); orderEntity.setInvStorageCode(invWarehouseEntity.getCode()); orderEntity.setUpdateTime(new Date()); + BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction()); + String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER+ MyStrUtil.trim(bussinessTypeEntity.getPrefix()), "yyyyMMdd")); + String orderId = orderNo; + orderEntity.setId(orderId); + orderService.insertOrder(orderEntity); List codeBeans = orderBean.getCodes(); List warehouseEntities = new ArrayList<>(); @@ -444,42 +427,6 @@ public class IoTransInoutService { } } - - //过期提醒： -// SystemParamConfigEntity expireParamConfigEntity = systemParamConfigService.selectByParamKey("expire_date_tip"); - - -// if (bussinessTypeEntity.isExpireTip()) { -// UdiEntity udiEntity = FilterUdiUtils.getUdi(warehouseEntity.getCode()); -// if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) { -// String expireDate = "20" + udiEntity.getExpireDate(); -// long expireTime = DateUtil.parseDateExpire(expireDate); -// if (expireTime - System.currentTimeMillis() < 0) { -// orderService.updateOrderStatus(warehouseEntity.getOrderId(), ConstantStatus.ORDER_STATUS_FAIL); -// orderService.updateRemark(orderEntity.getId(), "udi码：" + warehouseEntity.getCode() + "已经过期！"); -// return; -// } -// } -// } - - -// //近效期提醒： -// SystemParamConfigEntity recentParamConfigEntity = systemParamConfigService.selectByParamKey("recent_date_tip"); -// int recent = Integer.parseInt(recentParamConfigEntity.getParamValue()); -// if (recent > 0) { -// UdiEntity udiEntity = FilterUdiUtils.getUdi(warehouseEntity.getCode()); -// if (udiEntity.getExpireDate() != null) { -// String expireDate = "20" + udiEntity.getExpireDate(); -// long expireTime = DateUtil.parseDateExpire(expireDate); -// if (expireTime - System.currentTimeMillis() < recent * 24 * 60 * 60 * 1000) { -// orderService.updateOrderStatus(warehouseEntity.getOrderId(), ConstantStatus.ORDER_STATUS_FAIL); -// orderService.updateRemark(orderEntity.getId(), "udi码：" + warehouseEntity.getCode() + "临近过期！"); -// return; -// } -// } -// } - - //产品是否已维护已关联 if (StrUtil.isEmpty(warehouseEntity.getRelId())) { orderService.updateOrderStatus(warehouseEntity.getOrderId(), ConstantStatus.ORDER_STATUS_FAIL); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/ThrOrderImportService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/ThrOrderImportService.java index a8dc599..333ff11 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/ThrOrderImportService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/ThrOrderImportService.java @@ -121,6 +121,7 @@ public class ThrOrderImportService { } catch (Exception e) { } } + batchSession.close(); } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/ThrProductsImportService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/ThrProductsImportService.java index 7479f68..13d3f67 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/ThrProductsImportService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/ThrProductsImportService.java @@ -87,5 +87,6 @@ public class ThrProductsImportService { } catch (Exception e) { } } + batchSession.close(); } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/UdiDlHttpClient.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/UdiDlHttpClient.java index b636866..a66426f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/UdiDlHttpClient.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/UdiDlHttpClient.java @@ -1,10 +1,12 @@ package com.glxp.sale.admin.thread; +import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.glxp.sale.admin.entity.basic.UdiInfoEntity; import com.glxp.sale.admin.entity.receipt.ProductInfoEntity; import com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest; +import com.glxp.sale.admin.service.basic.UdiInfoService; import com.glxp.sale.admin.service.receipt.ProductInfoService; import com.glxp.sale.admin.util.BeanUtils; import com.glxp.sale.admin.util.HttpClient; @@ -29,6 +31,8 @@ public class UdiDlHttpClient { @Resource ProductInfoService productInfoService; + @Resource + UdiInfoService udiInfoService; public List getUdiByUuid(String uuid) { ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest(); @@ -49,6 +53,21 @@ public class UdiDlHttpClient { return udiInfoEntities; } + + public List getOrUpdateByUuid(String uuid) { + + List udiInfoEntities = getUdiByUuid(uuid); + if (CollUtil.isNotEmpty(udiInfoEntities)) { + UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(udiInfoEntities.get(0).getNameCode()); + if (udiInfoEntity != null) { + List exitUdis = udiInfoService.findByUuids(udiInfoEntity.getUuid()); + return exitUdis; + } + } + return udiInfoEntities; + } + + public List getUdiByDi(String key) { ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest(); productInfoFilterRequest.setPage(1); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/Constant.java b/api-admin/src/main/java/com/glxp/sale/admin/util/Constant.java index 0b6a053..8d7f373 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/util/Constant.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/Constant.java @@ -2,6 +2,8 @@ package com.glxp.sale.admin.util; public class Constant { + public static String SYSTEM_CUSTOMER_ID = "110"; + public static final String dlThrProducts = "THR_DOWNLOAD_PRODUCTS"; public static final String dlThrInvProducts = "THR_DOWNLOAD_INV_PRODUCTS"; public static final String dlThrOrders = "THR_DOWNLOAD_ORDERS"; @@ -16,5 +18,7 @@ public class Constant { public static final String SERIAL_CACHE_PREFIX = "serial_"; public static final String SERIAL_CACHE_PREFIX_ST = "serialst_"; + public static final String SCAN_ORDER = "MS"; + public static final String BUS_ORDER = "MY"; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/FilterUdiUtils.java b/api-admin/src/main/java/com/glxp/sale/admin/util/FilterUdiUtils.java index 3b1b7de..1829e81 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/util/FilterUdiUtils.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/FilterUdiUtils.java @@ -82,6 +82,8 @@ public class FilterUdiUtils { batchNo = data.substring(34, data.length()); } + }else if (data.length() >= 34 && data.substring(32, 34).equals("21")) { + serialNo = data.substring(34, data.length()); } } else if (data.length() >= 26 && data.substring(24, 26).equals("10")) { if (data.contains("\u001D")) { @@ -117,6 +119,8 @@ public class FilterUdiUtils { batchNo = data.substring(34, data.length()); } + } else if (data.length() >= 34 && data.substring(32, 34).equals("21")) { + serialNo = data.substring(34, data.length()); } } else if (data.length() >= 26 && data.substring(24, 26).equals("10")) { if (data.contains("\u001D")) { diff --git a/api-admin/src/main/resources/application-pro.properties b/api-admin/src/main/resources/application-pro.properties index 69c584d..db812f2 100644 --- a/api-admin/src/main/resources/application-pro.properties +++ b/api-admin/src/main/resources/application-pro.properties @@ -32,8 +32,8 @@ logging.level.com.glxp.api.admin.dao.inventory=debug logging.level.com.glxp.api.admin.dao.thrsys=debug # \u8F93\u51FA\u65E5\u5FD7\u5230\u9879\u76EE\u6839\u76EE\u5F55\u4E0B\u7684springboot.log\u6587\u4EF6\u4E2D // \u914D\u7F6E logback-spring.xml\u65F6 \u6B64\u65E5\u5FD7\u8F93\u51FA\u65B9\u5F0F\u4F1A\u88AB\u8986\u76D6\u3002 logging.file=D:/glxpdata/udiwms/udiwms.log -file_path=/home/glxpdata/udiwms -#file_path=D:/glxpdata/udiwms +#file_path=/home/glxpdata/udiwms +file_path=D:/glxpdata/udiwms #UDI\u6570\u636E\u4E0B\u8F7D UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test 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 261f1ce..3a34122 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -252,26 +252,31 @@ AND (thirdId ]]> '' or thirdId1 ]]> '' or thirdId2 ]]> '' or thirdId3 ]]> '' or thirdId4 ]]> '' ) - and basic_products.flbm ]]> '' + and basic_products.originUuid ]]> '' - AND basic_products.flbm is NULL + AND basic_products.originUuid is NULL - AND thirdId is NULL and basic_products.flbm ]]> '' + AND mainId is NULL and basic_products.originUuid ]]> '' - AND thirdId1 is NULL and basic_products.flbm ]]> '' + AND thirdId1 is NULL and basic_products.originUuid ]]> '' - AND thirdId2 is NULL and basic_products.flbm ]]> '' + AND thirdId2 is NULL and basic_products.originUuid ]]> '' - AND thirdId3 is NULL and basic_products.flbm ]]> '' + AND thirdId3 is NULL and basic_products.originUuid ]]> '' - AND thirdId4 is NULL and basic_products.flbm ]]> '' + AND thirdId4 is NULL and basic_products.originUuid ]]> '' + + + AND basic_udirel.updateTime is NULL + + AND basic_udirel.lockStatus = #{lockStatus} 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 08f02d0..c229827 100644 --- a/api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml @@ -36,7 +36,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.lockStatus, + basic_udirel.manufactory,basic_udirel.measname,basic_udirel.lockStatus,basic_udirel.allowNoBatch, 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,basic_udirel.isDisable, @@ -100,13 +100,13 @@ AND (thirdId ]]> '' or thirdId1 ]]> '' or thirdId2 ]]> '' or thirdId3 ]]> '' or thirdId4 ]]> '' ) - and basic_products.flbm ]]> '' + and basic_products.originUuid ]]> '' - AND basic_products.flbm is NULL + AND basic_products.originUuid is NULL - AND thirdId is NULL and basic_products.flbm ]]> '' + AND mainId is NULL and basic_products.originUuid ]]> '' AND thirdId1 is NULL and basic_products.flbm ]]> '' @@ -120,6 +120,10 @@ AND thirdId4 is NULL and basic_products.flbm ]]> '' + + AND basic_udirel.updateTime is NULL + + AND company_product_relevance.customerId = #{customerId}