From a3256cda2aef2f45d93a0ca108da0200f729574f Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 26 Jul 2021 08:56:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=8E=EF=BC=8C=E5=8F=AF?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/UdiRelevanceController.java | 54 ++++ .../controller/info/SetupController.java | 39 --- .../controller/inout/OrderController.java | 23 +- .../inout/OrderDetailController.java | 5 +- .../controller/inout/WareHouseController.java | 2 +- .../inout/utils/ContrastErpUtil.java | 1 + .../inventory/InvErpOnhandController.java | 62 ++--- .../inventory/InvPrintController.java | 57 ++--- .../glxp/api/admin/dao/info/ScheduledDao.java | 2 +- .../admin/dao/inventory/InvErpStockDao.java | 24 -- .../admin/dao/inventory/InvOrderCheckDao.java | 2 - .../admin/dao/inventory/InvStockPrintDao.java | 4 +- .../{basic => inventory}/ErpStockEntity.java | 2 +- .../StockPrintEntity.java | 2 +- .../api/admin/httpclient/ErpInvClient.java | 38 ++- .../api/admin/httpclient/ErpOrderClient.java | 17 +- .../admin/req/basic/FilterUdiInfoRequest.java | 1 + .../req/basic/PostSmpUdiInfoRequest.java | 228 +++++++++++++++++ .../req/{udid => info}/ScheduledRequest.java | 2 +- .../admin/req/inventory/ErpOnhandRequest.java | 3 + .../res/inventory/ErpInvProductResponse.java | 15 ++ .../basic/impl/UdiRelevanceServiceImpl.java | 7 +- .../api/admin/service/info/SetupService.java | 19 -- .../service/info/impl/SetupServiceImpl.java | 40 --- .../service/inventory/InvErpStockService.java | 21 -- .../inventory/InvStockPrintService.java | 2 +- .../impl/InvErpStockServiceImpl.java | 41 --- .../impl/InvStockPrintServiceImpl.java | 2 +- .../admin/thread/BasicUpdateErpDataTask.java | 4 +- .../admin/thread/InvDlErpStockService.java | 108 -------- .../admin/thread/InvImportStockService.java | 211 +++++++--------- .../api/admin/thread/InvUpdateStock1Task.java | 5 +- .../api/admin/thread/InvUpdateStock2Task.java | 5 +- ...lErpStockTask.java => IoErpCheckTask.java} | 18 +- .../api/admin/thread/IoModifyErpTask.java | 45 ++-- .../api/admin/thread/IoTransInoutTask.java | 3 +- .../main/resources/application-dev.properties | 7 +- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 3 + .../mybatis/mapper/info/CompanyDao.xml | 6 +- .../mybatis/mapper/info/ScheduleDao.xml | 8 +- .../mybatis/mapper/info/SetupDao.xml | 58 ----- .../mapper/info/SystemParamConfigDao.xml | 14 +- .../mapper/inventory/InvErpStockDao.xml | 71 ------ .../mapper/inventory/InvOrderCheckDao.xml | 10 +- .../mapper/inventory/InvStockPrintDao.xml | 26 +- .../com/glxp/api/admin/util/DlDeviceTest.java | 1 - .../api/common/constant/CacheConstant.class | Bin 233 -> 233 bytes .../converter/LongList2StringConverter.class | Bin 1489 -> 1483 bytes .../converter/String2LongListConverter.class | Bin 1490 -> 1481 bytes .../String2StringListConverter.class | Bin 1274 -> 1268 bytes .../glxp/api/common/enums/ResultEnum.class | Bin 2291 -> 2288 bytes .../api/common/req/BaseLimitRequest.class | Bin 1248 -> 1248 bytes .../com/glxp/api/common/req/BaseRequest.class | Bin 1096 -> 1096 bytes .../glxp/api/common/res/BaseResponse.class | Bin 2921 -> 2915 bytes .../glxp/api/common/util/ResultVOUtils.class | Bin 2007 -> 2007 bytes .../api/common/util/ResultVOUtilsTest.class | Bin 393 -> 393 bytes scripts/vue-admin.sql | 234 ------------------ 57 files changed, 570 insertions(+), 982 deletions(-) delete mode 100644 api-admin/src/main/java/com/glxp/api/admin/controller/info/SetupController.java delete mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvErpStockDao.java rename api-admin/src/main/java/com/glxp/api/admin/entity/{basic => inventory}/ErpStockEntity.java (87%) rename api-admin/src/main/java/com/glxp/api/admin/entity/{basic => inventory}/StockPrintEntity.java (93%) create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/basic/PostSmpUdiInfoRequest.java rename api-admin/src/main/java/com/glxp/api/admin/req/{udid => info}/ScheduledRequest.java (76%) create mode 100644 api-admin/src/main/java/com/glxp/api/admin/res/inventory/ErpInvProductResponse.java delete mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/info/SetupService.java delete mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SetupServiceImpl.java delete mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvErpStockService.java delete mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvErpStockServiceImpl.java delete mode 100644 api-admin/src/main/java/com/glxp/api/admin/thread/InvDlErpStockService.java rename api-admin/src/main/java/com/glxp/api/admin/thread/{InvDlErpStockTask.java => IoErpCheckTask.java} (74%) delete mode 100644 api-admin/src/main/resources/mybatis/mapper/info/SetupDao.xml delete mode 100644 api-admin/src/main/resources/mybatis/mapper/inventory/InvErpStockDao.xml delete mode 100644 scripts/vue-admin.sql diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java index 4aa4d384..06c10ec0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java @@ -1,5 +1,7 @@ package com.glxp.api.admin.controller.basic; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; import com.github.pagehelper.PageInfo; import com.glxp.api.admin.entity.basic.UdiInfoEntity; import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; @@ -8,18 +10,22 @@ import com.glxp.api.admin.entity.inout.WarehouseEntity; import com.glxp.api.admin.httpclient.UdiDlHttpClient; import com.glxp.api.admin.req.basic.CombineRequest; import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; +import com.glxp.api.admin.req.basic.PostSmpUdiInfoRequest; import com.glxp.api.admin.req.inout.DeleteRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.UdiRelevanceResponse; +import com.glxp.api.admin.res.inout.WarehouseResponse; import com.glxp.api.admin.service.basic.UdiInfoService; import com.glxp.api.admin.service.basic.UdiRelevanceService; import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.service.inout.CodesService; import com.glxp.api.admin.thread.BasicUpdateproductService; import com.glxp.api.admin.util.DateUtil; +import com.glxp.api.admin.util.HttpClient; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; @@ -28,7 +34,9 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; @RestController public class UdiRelevanceController { @@ -224,5 +232,51 @@ public class UdiRelevanceController { return ResultVOUtils.success("添加成功"); } + //上传产品信息至供应商管理平台 + @PostMapping("/udiwms/smp/udirl/upload") + public BaseResponse uploadSMP(@RequestBody CombineRequest combineRequest) { + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("smp_uploadProduct_url"); + String postUrl; + if (systemParamConfigEntity == null) + return ResultVOUtils.error(500, "上传供应商平台接口地址未定义"); + else + postUrl = systemParamConfigEntity.getParamValue(); + List ids = combineRequest.getKeys(); + if (ids != null && ids.size() > 0) { + List udiRelevanceResponses = new ArrayList<>(); + List postSmpUdiInfoRequests = new ArrayList<>(); + for (int i = 0; i < ids.size(); i++) { + FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); + filterUdiInfoRequest.setId(ids.get(i)); + List temps = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest); + if (temps != null && temps.size() > 0) { + udiRelevanceResponses.addAll(temps); + } + } + List postDatas = udiRelevanceResponses.stream().map(item -> + { + PostSmpUdiInfoRequest postSmpUdiInfoRequest = new PostSmpUdiInfoRequest(); + BeanUtils.copyProperties(item, postSmpUdiInfoRequest); + postSmpUdiInfoRequest.setErpId(item.getThirdId()); + postSmpUdiInfoRequest.setErpName(item.getThirdName()); + return postSmpUdiInfoRequest; + }).collect(Collectors.toList()); + String response = HttpClient.uCloudPost(postUrl, postDatas); + BaseResponse baseResponse = + JSONObject.parseObject(response, new TypeReference() { + }); + if (baseResponse.getCode() == 20000) { + return ResultVOUtils.success("上传成功！"); + } else { + return ResultVOUtils.error(baseResponse.getCode(), baseResponse.getMessage()); + } + }else { + return ResultVOUtils.error(500,"未选择产品信息"); + } + + + + } + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/info/SetupController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/info/SetupController.java deleted file mode 100644 index 8975bf81..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/info/SetupController.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.glxp.api.admin.controller.info; - -import com.glxp.api.admin.entity.info.SetupEntity; -import com.glxp.api.admin.req.info.FilterSetupRequest; -import com.glxp.api.admin.service.info.SetupService; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.List; - -@RestController -public class SetupController { - - @Resource - private SetupService setupService; - - @GetMapping("/udi/info/setup") - public BaseResponse getCompanyInfo(FilterSetupRequest filterSetupRequest) { - filterSetupRequest.setId(1); - SetupEntity setupEntity = setupService.findSetup(filterSetupRequest); - if (setupEntity != null) { - return ResultVOUtils.success(setupEntity); - } - return ResultVOUtils.error(500, "设置信息为空"); - } - - @PostMapping("/udi/info/setup/modify") - public BaseResponse modifyCompany(@RequestBody SetupEntity setupEntity) { - setupEntity.setId(1); - setupService.modifySetup(setupEntity); - return ResultVOUtils.success("修改成功"); - } - -} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java index 2cb1ece2..9a4077c6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java @@ -51,13 +51,9 @@ public class OrderController { @Resource private SystemParamConfigService systemParamConfigService; - @Value("${UCLOD_SERVER_URL}") - private String ucloudUrl; - - @GetMapping("udiwms/inout/order/error") + @GetMapping("udiwms/inout/order/status") public BaseResponse listOrderError(OrderFilterRequest orderFilterRequest) { - orderFilterRequest.setStatus(ConstantStatus.ORDER_STATUS_FAIL); List orderEntityList = orderService.filterList(orderFilterRequest); PageInfo pageInfo; pageInfo = new PageInfo<>(orderEntityList); @@ -99,15 +95,8 @@ public class OrderController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - boolean b = orderService.updateUnit(orderEntity); - if (!b) { - return ResultVOUtils.error(ResultEnum.NOT_NETWORK); - } - - b = warehouseService.updateUnit(orderEntity.getId(), orderEntity.getFromCorpId(), orderEntity.getFromCorp()); - if (!b) { - return ResultVOUtils.error(ResultEnum.NOT_NETWORK); - } + orderService.updateUnit(orderEntity); + warehouseService.updateUnit(orderEntity.getId(), orderEntity.getFromCorpId(), orderEntity.getFromCorp()); return ResultVOUtils.success("添加成功"); } @@ -202,7 +191,11 @@ public class OrderController { } mainOrderEntity.setErpFk(docidStr); orderService.updateOrder(mainOrderEntity); - List erpOrderEntities = new ErpOrderClient(ucloudUrl).getErpOrder(docids, mainOrderEntity.getAction()); + SystemParamConfigEntity erpEntity = systemParamConfigService.selectByParamKey("erp_order_query"); + if (erpEntity == null) { + return ResultVOUtils.error(500, "ERP出入库单据查询接口地址未定义"); + } + List erpOrderEntities = new ErpOrderClient(erpEntity.getParamValue()).getErpOrder(docids, mainOrderEntity.getAction()); if (erpOrderEntities != null && erpOrderEntities.size() > 0) { List returnOrders = new ContrastErpUtil().transErp(erpOrderEntities, udiRelevanceService, mainOrder); myErpOrderService.insertErpOrders(returnOrders); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java index c4d57fd3..0ea4c773 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java @@ -18,7 +18,6 @@ import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.service.inout.OrderDetailService; import com.glxp.api.admin.service.inout.OrderService; import com.glxp.api.admin.service.inout.CodesService; -import com.glxp.api.admin.thread.InvDlErpStockService; import com.glxp.api.admin.thread.IoTransInoutService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; @@ -49,8 +48,6 @@ public class OrderDetailController { OrderService orderService; @Resource private UdiRelevanceService udiRelevanceService; - @Resource - private InvDlErpStockService dlErpStockService; @Resource @@ -175,7 +172,7 @@ public class OrderDetailController { @GetMapping("/warehouse/dlErpStock1") public BaseResponse dlErpStock() { - dlErpStockService.dlErpStock(); +// dlErpStockService.dlErpStock(); return ResultVOUtils.success("后台已自动更新，请稍后刷新查看！"); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java index b9bb925a..3fcb73cd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java @@ -132,7 +132,7 @@ public class WareHouseController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } transInoutService.repeatCommit(commitRequest); - return ResultVOUtils.success("提交成功"); + return ResultVOUtils.success("提交成功，后台已开启重码校验，请稍后刷新查看！"); } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/ContrastErpUtil.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/ContrastErpUtil.java index e55e333e..08cfc70c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/ContrastErpUtil.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/ContrastErpUtil.java @@ -103,6 +103,7 @@ public class ContrastErpUtil { } else { orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_SUCCESS); } + orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); orderService.updateOrder(orderEntity); if (errorData.size() > 0) { new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, errorData); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvErpOnhandController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvErpOnhandController.java index 101282cf..be286e19 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvErpOnhandController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvErpOnhandController.java @@ -4,12 +4,17 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; import com.glxp.api.admin.entity.basic.UdiEntity; +import com.glxp.api.admin.entity.info.SystemParamConfigEntity; +import com.glxp.api.admin.httpclient.ErpInvClient; import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; import com.glxp.api.admin.req.basic.UOnhandQueryRequest; +import com.glxp.api.admin.req.inventory.ErpOnhandRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.UOnhandQueryResponse; import com.glxp.api.admin.res.basic.UdiRelevanceResponse; +import com.glxp.api.admin.res.inventory.ErpOnHandResponse; import com.glxp.api.admin.service.basic.UdiRelevanceService; +import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.util.FilterUdiUtils; import com.glxp.api.admin.util.HttpClient; import com.glxp.api.common.enums.ResultEnum; @@ -28,15 +33,14 @@ import java.util.Map; @RestController public class InvErpOnhandController { - @Value("${UCLOD_SERVER_URL}") - private String ucloudUrl; @Resource UdiRelevanceService udiRelevanceService; + @Resource + private SystemParamConfigService systemParamConfigService; - - @GetMapping("/warehouse/ucloud/onHand") - public BaseResponse getOnhand(UOnhandQueryRequest onhandQueryRequest, + @GetMapping("/udiwms/inv/getOnHand") + public BaseResponse getOnhand(ErpOnhandRequest onhandQueryRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -48,8 +52,8 @@ public class InvErpOnhandController { UdiRelevanceResponse udiRelevanceResponse = findByNamecode(udiEntity.getUdi()); if (udiRelevanceResponse != null) { String thirdId = udiRelevanceResponse.getThirdId(); - onhandQueryRequest.setInventory(thirdId); - onhandQueryRequest.setBatchcode(udiEntity.getBatchNo()); + onhandQueryRequest.setNameCode(thirdId); + onhandQueryRequest.setBatchNo(udiEntity.getBatchNo()); } else { return ResultVOUtils.error(500, "产品信息未维护！"); @@ -61,41 +65,16 @@ public class InvErpOnhandController { } } else if (onhandQueryRequest.getNameCode() != null) { UdiRelevanceResponse udiRelevanceResponse = findByNamecode(onhandQueryRequest.getNameCode()); - onhandQueryRequest.setInventory(udiRelevanceResponse.getThirdId()); - } - - Map paramMap = new HashMap<>(16); - if (onhandQueryRequest.getBatchcode() != null && !onhandQueryRequest.getBatchcode().equals("")) - paramMap.put("batchcode", onhandQueryRequest.getBatchcode()); - if (onhandQueryRequest.getWarehouse() != null && !onhandQueryRequest.getWarehouse().equals("")) - paramMap.put("warehouse", onhandQueryRequest.getWarehouse()); - if (onhandQueryRequest.getIsGroupByBatchcode() != null && !onhandQueryRequest.getIsGroupByBatchcode().equals("")) - paramMap.put("isGroupByBatchcode", onhandQueryRequest.getIsGroupByBatchcode()); - if (onhandQueryRequest.getNumcondition() != null && !onhandQueryRequest.getNumcondition().equals("")) - paramMap.put("numcondition", onhandQueryRequest.getNumcondition()); - paramMap.put("inventory", onhandQueryRequest.getInventory()); - - - String response = HttpClient.mipsGet(ucloudUrl + "/uclooud/basic/onhandQuery", paramMap); - try { - BaseResponse> onHandsResponse = - JSONObject.parseObject(response, new TypeReference>>() { - }); - List invmandocResponses = onHandsResponse.getData().getList(); - for (UOnhandQueryResponse invmandocResponse : invmandocResponses) { - UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(invmandocResponse.getCinventory_code()); - if (udiRelevanceEntity != null) { - invmandocResponse.setChecked(true); - } else { - invmandocResponse.setChecked(false); - } - - } - return onHandsResponse; - } catch (Exception e) { - e.printStackTrace(); - return ResultVOUtils.error(500, "连接U8云下载服务出错！"); + onhandQueryRequest.setInventoryCode(udiRelevanceResponse.getThirdId()); } + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_onhand_query"); + String onHandUrl; + if (systemParamConfigEntity == null) + return ResultVOUtils.error(500, "ERP现存量接口地址未定义"); + else + onHandUrl = systemParamConfigEntity.getParamValue(); + BaseResponse> responseBaseResponse = new ErpInvClient().getOnHandResponse(onhandQueryRequest, onHandUrl); + return responseBaseResponse; } @@ -111,5 +90,4 @@ public class InvErpOnhandController { } - } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPrintController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPrintController.java index 117fec95..ceb933a2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPrintController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPrintController.java @@ -4,19 +4,14 @@ import com.github.pagehelper.PageInfo; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; import com.glxp.api.admin.httpclient.ErpInvClient; import com.glxp.api.admin.req.inventory.ErpOnhandRequest; -import com.glxp.api.admin.res.inout.PurchaseinResponse; -import com.glxp.api.admin.entity.basic.ErpStockEntity; -import com.glxp.api.admin.entity.basic.StockPrintEntity; +import com.glxp.api.admin.entity.inventory.StockPrintEntity; import com.glxp.api.admin.req.basic.FilterStockprintRequest; import com.glxp.api.admin.req.basic.UpdatePrintStatusRequest; import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.inout.ImportErpOrderRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.inventory.ErpOnHandResponse; -import com.glxp.api.admin.service.inventory.InvErpStockService; import com.glxp.api.admin.service.inventory.InvStockPrintService; import com.glxp.api.admin.service.info.SystemParamConfigService; -import com.glxp.api.admin.thread.InvDlErpStockService; import com.glxp.api.admin.thread.InvImportStockService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; @@ -25,7 +20,6 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.List; @RestController @@ -35,10 +29,6 @@ public class InvPrintController { @Resource InvImportStockService importStockService; @Resource - private InvDlErpStockService dlErpStockService; - @Resource - private InvErpStockService erpStockService; - @Resource private SystemParamConfigService systemParamConfigService; @PostMapping("/udiwarehouse/stockPrint/filter") @@ -172,37 +162,28 @@ public class InvPrintController { } - @PostMapping("/warehouse/stockPrint/importErpStock") - public BaseResponse importErpStock(@RequestBody ImportErpOrderRequest importErpOrderRequest, BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - List docids = importErpOrderRequest.getPurchaseinResponses(); - if (docids != null && docids.size() > 0) { - for (PurchaseinResponse purchaseinResponse : docids) { - List stockEntities = new ArrayList<>(); - for (PurchaseinResponse.SubPurchase subPurchase : purchaseinResponse.getSubPurchases()) { - ErpStockEntity erpStockEntity = new ErpStockEntity(); - erpStockEntity.setOrderId(purchaseinResponse.getVbillcode()); - erpStockEntity.setExpirationDate(subPurchase.getDvalidate()); - erpStockEntity.setCode(subPurchase.getInventory_code()); - erpStockEntity.setBatchNo(subPurchase.getVbatchcode()); - erpStockEntity.setName(subPurchase.getInventory_name()); - erpStockEntity.setCount(subPurchase.getDtlgoodsqty() + ""); - stockEntities.add(erpStockEntity); - } - erpStockService.insertErpStocks(stockEntities); - } - } - return ResultVOUtils.success("导入成功"); - } - @GetMapping("/warehouse/stockPrint/dlErpStock") public BaseResponse dlErpStock() { - dlErpStockService.dlErpStock(); +// dlErpStockService.dlErpStock(); return ResultVOUtils.success("后台已自动更新，请稍后刷新查看！"); } + @GetMapping("/udiwarehouse/stockPrint/importBycode") + public BaseResponse importBycode(FilterStockprintRequest stockprintRequest) { + if (stockprintRequest.getThirdId() == null || stockprintRequest.getThirdId().equals("")) { + return ResultVOUtils.error(500, "存货编码不能为空"); + } + + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_inv_product_query"); + String url; + if (systemParamConfigEntity == null) + return ResultVOUtils.error(500, "ERP库存产品信息查询接口地址未定义"); + else url = systemParamConfigEntity.getParamValue(); + + importStockService.updateByCode(stockprintRequest.getThirdId(),url); + return ResultVOUtils.success("后台已开始自动更新，请稍后刷新查看"); + } + + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/info/ScheduledDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/info/ScheduledDao.java index 623aa499..eca347f9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/info/ScheduledDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/info/ScheduledDao.java @@ -1,7 +1,7 @@ package com.glxp.api.admin.dao.info; import com.glxp.api.admin.entity.info.ScheduledEntity; -import com.glxp.api.admin.req.udid.ScheduledRequest; +import com.glxp.api.admin.req.info.ScheduledRequest; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvErpStockDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvErpStockDao.java deleted file mode 100644 index 5592a15c..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvErpStockDao.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.glxp.api.admin.dao.inventory; - -import com.glxp.api.admin.entity.basic.ErpStockEntity; -import com.glxp.api.admin.req.basic.FilterStockprintRequest; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface InvErpStockDao { - - ErpStockEntity findByCode(@Param("code") String code, @Param("batchNo") String batchNo); - - boolean insertErpStock(ErpStockEntity stockPrintEntity); - - boolean insertErpStocks(@Param("erpStockEntities") List erpStockEntities); - - boolean updateErpStock(ErpStockEntity udiInfoEntity); - - boolean deleteById(@Param("id") String id); - - -} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvOrderCheckDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvOrderCheckDao.java index a901517d..23638ea8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvOrderCheckDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvOrderCheckDao.java @@ -1,8 +1,6 @@ package com.glxp.api.admin.dao.inventory; -import com.glxp.api.admin.entity.basic.StockPrintEntity; import com.glxp.api.admin.entity.inout.StockCheckEntity; -import com.glxp.api.admin.req.basic.FilterStockprintRequest; import com.glxp.api.admin.req.inout.FilterStockCheckRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvStockPrintDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvStockPrintDao.java index e4f50e27..6a8fb139 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvStockPrintDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvStockPrintDao.java @@ -1,9 +1,7 @@ package com.glxp.api.admin.dao.inventory; -import com.glxp.api.admin.entity.basic.StockPrintEntity; -import com.glxp.api.admin.entity.basic.UdiInfoEntity; +import com.glxp.api.admin.entity.inventory.StockPrintEntity; import com.glxp.api.admin.req.basic.FilterStockprintRequest; -import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/ErpStockEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/ErpStockEntity.java similarity index 87% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/ErpStockEntity.java rename to api-admin/src/main/java/com/glxp/api/admin/entity/inventory/ErpStockEntity.java index 92e4a871..249a347b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/ErpStockEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/ErpStockEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.admin.entity.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/StockPrintEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/StockPrintEntity.java similarity index 93% rename from api-admin/src/main/java/com/glxp/api/admin/entity/basic/StockPrintEntity.java rename to api-admin/src/main/java/com/glxp/api/admin/entity/inventory/StockPrintEntity.java index 0eb942f1..1eb0b49b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/StockPrintEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/StockPrintEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.basic; +package com.glxp.api.admin.entity.inventory; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpInvClient.java b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpInvClient.java index f74ba52b..332edbe4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpInvClient.java +++ b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpInvClient.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.glxp.api.admin.req.inventory.ErpOnhandRequest; import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.inventory.ErpInvProductResponse; import com.glxp.api.admin.res.inventory.ErpOnHandResponse; import com.glxp.api.admin.util.HttpClient; import com.glxp.api.common.res.BaseResponse; @@ -17,6 +18,13 @@ public class ErpInvClient { public List getOnHand(ErpOnhandRequest onhandRequest, String url) { + BaseResponse> onHandsResponse = getOnHandResponse(onhandRequest, url); + List erpOnHandResponses = onHandsResponse.getData().getList(); + return erpOnHandResponses; + } + + public BaseResponse> getOnHandResponse(ErpOnhandRequest onhandRequest, String url) { + Map paramMap = new HashMap<>(16); if (onhandRequest.getBatchNo() != null && !onhandRequest.getBatchNo().equals("")) paramMap.put("batchNo", onhandRequest.getBatchNo()); @@ -29,11 +37,37 @@ public class ErpInvClient { BaseResponse> onHandsResponse = JSONObject.parseObject(response, new TypeReference>>() { }); - List erpOnHandResponses = onHandsResponse.getData().getList(); - return erpOnHandResponses; + return onHandsResponse; + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + + public BaseResponse> getInvPrdoductResponse(ErpOnhandRequest onhandRequest, String url) { + + Map paramMap = new HashMap<>(16); + if (onhandRequest.getBatchNo() != null && !onhandRequest.getBatchNo().equals("")) + paramMap.put("batchNo", onhandRequest.getBatchNo()); + if (onhandRequest.getWarehouseCode() != null && !onhandRequest.getWarehouseCode().equals("")) + paramMap.put("warehouseCode", onhandRequest.getWarehouseCode()); + if (onhandRequest.getInventoryCode() != null && !onhandRequest.getInventoryCode().equals("")) + paramMap.put("inventoryCode", onhandRequest.getInventoryCode()); + String response = HttpClient.mipsGet(url, paramMap); + try { + BaseResponse> onHandsResponse = + JSONObject.parseObject(response, new TypeReference>>() { + }); + return onHandsResponse; } catch (Exception e) { e.printStackTrace(); } return null; } + + public List getInvPrdoduct(ErpOnhandRequest onhandRequest, String url) { + BaseResponse> responseBaseResponse = getInvPrdoductResponse(onhandRequest, url); + List responseList = responseBaseResponse.getData().getList(); + return responseList; + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpOrderClient.java b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpOrderClient.java index 6e4e80b6..3bfb9dcf 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpOrderClient.java +++ b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpOrderClient.java @@ -24,7 +24,6 @@ public class ErpOrderClient { private String url; public ErpOrderClient() { - } public ErpOrderClient(String url) { @@ -35,9 +34,9 @@ public class ErpOrderClient { List erpOrderEntities = new ArrayList<>(); if (billCodes != null && billCodes.size() > 0) { for (int i = 0; i < billCodes.size(); i++) { - ErpOrderEntity erpOrderEntity = getErpOrder(billCodes.get(i), action); - if (erpOrderEntity != null) { - erpOrderEntities.add(erpOrderEntity); + List erpOrderEntitys = getErpOrder(billCodes.get(i), action); + if (erpOrderEntitys != null) { + erpOrderEntities.addAll(erpOrderEntitys); } } } @@ -111,17 +110,17 @@ public class ErpOrderClient { return null; } - public ErpOrderEntity getErpOrder(String billCode, String action) { + public List getErpOrder(String billCode, String action) { FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); filterOrderRequest.setPage(1); filterOrderRequest.setLimit(1); filterOrderRequest.setBillAction(action); filterOrderRequest.setBillNo(billCode); List erpOrderEntities = getErpOrder(filterOrderRequest); - if (erpOrderEntities != null && erpOrderEntities.size() > 0) { - return erpOrderEntities.get(0); - } - return null; +// if (erpOrderEntities != null && erpOrderEntities.size() > 0) { +// return erpOrderEntities.get(0); +// } + return erpOrderEntities; } public BaseResponse postBill(Map> postMap, String billAction, String uploadUrl) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java index 78ebdb6f..61faeca7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java @@ -12,5 +12,6 @@ public class FilterUdiInfoRequest extends ListPageRequest { private String uuid; private String ggxh; private String thirdId; + private String id; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/PostSmpUdiInfoRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/PostSmpUdiInfoRequest.java new file mode 100644 index 00000000..d1e84fa8 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/PostSmpUdiInfoRequest.java @@ -0,0 +1,228 @@ +package com.glxp.api.admin.req.basic; + +public class PostSmpUdiInfoRequest { + + /** + * nameCode : 321 + * packLevel : + * bhxjsl : 0 + * bhzxxsbzsl : 0 + * zxxsbzbhsydysl : 0 + * bhxjcpbm : + * bzcj : + * deviceRecordKey : + * cpmctymc : + * cplb : + * flbm : + * ggxh : + * qxlb : + * tyshxydm : + * ylqxzcrbarmc : + * zczbhhzbapzbh : + * sjcpbm : + * versionNumber : 0 + * diType : 0 + * erpId : + * erpName : + * uuid : 123 + */ + + private String nameCode; + private String packLevel; + private int bhxjsl; + private int bhzxxsbzsl; + private int zxxsbzbhsydysl; + private String bhxjcpbm; + private String bzcj; + private String deviceRecordKey; + private String cpmctymc; + private String cplb; + private String flbm; + private String ggxh; + private String qxlb; + private String tyshxydm; + private String ylqxzcrbarmc; + private String zczbhhzbapzbh; + private String sjcpbm; + private int versionNumber; + private int diType; + private String erpId; + private String erpName; + private String uuid; + + public String getNameCode() { + return nameCode; + } + + public void setNameCode(String nameCode) { + this.nameCode = nameCode; + } + + public String getPackLevel() { + return packLevel; + } + + public void setPackLevel(String packLevel) { + this.packLevel = packLevel; + } + + public int getBhxjsl() { + return bhxjsl; + } + + public void setBhxjsl(int bhxjsl) { + this.bhxjsl = bhxjsl; + } + + public int getBhzxxsbzsl() { + return bhzxxsbzsl; + } + + public void setBhzxxsbzsl(int bhzxxsbzsl) { + this.bhzxxsbzsl = bhzxxsbzsl; + } + + public int getZxxsbzbhsydysl() { + return zxxsbzbhsydysl; + } + + public void setZxxsbzbhsydysl(int zxxsbzbhsydysl) { + this.zxxsbzbhsydysl = zxxsbzbhsydysl; + } + + public String getBhxjcpbm() { + return bhxjcpbm; + } + + public void setBhxjcpbm(String bhxjcpbm) { + this.bhxjcpbm = bhxjcpbm; + } + + public String getBzcj() { + return bzcj; + } + + public void setBzcj(String bzcj) { + this.bzcj = bzcj; + } + + public String getDeviceRecordKey() { + return deviceRecordKey; + } + + public void setDeviceRecordKey(String deviceRecordKey) { + this.deviceRecordKey = deviceRecordKey; + } + + public String getCpmctymc() { + return cpmctymc; + } + + public void setCpmctymc(String cpmctymc) { + this.cpmctymc = cpmctymc; + } + + public String getCplb() { + return cplb; + } + + public void setCplb(String cplb) { + this.cplb = cplb; + } + + public String getFlbm() { + return flbm; + } + + public void setFlbm(String flbm) { + this.flbm = flbm; + } + + public String getGgxh() { + return ggxh; + } + + public void setGgxh(String ggxh) { + this.ggxh = ggxh; + } + + public String getQxlb() { + return qxlb; + } + + public void setQxlb(String qxlb) { + this.qxlb = qxlb; + } + + public String getTyshxydm() { + return tyshxydm; + } + + public void setTyshxydm(String tyshxydm) { + this.tyshxydm = tyshxydm; + } + + public String getYlqxzcrbarmc() { + return ylqxzcrbarmc; + } + + public void setYlqxzcrbarmc(String ylqxzcrbarmc) { + this.ylqxzcrbarmc = ylqxzcrbarmc; + } + + public String getZczbhhzbapzbh() { + return zczbhhzbapzbh; + } + + public void setZczbhhzbapzbh(String zczbhhzbapzbh) { + this.zczbhhzbapzbh = zczbhhzbapzbh; + } + + public String getSjcpbm() { + return sjcpbm; + } + + public void setSjcpbm(String sjcpbm) { + this.sjcpbm = sjcpbm; + } + + public int getVersionNumber() { + return versionNumber; + } + + public void setVersionNumber(int versionNumber) { + this.versionNumber = versionNumber; + } + + public int getDiType() { + return diType; + } + + public void setDiType(int diType) { + this.diType = diType; + } + + public String getErpId() { + return erpId; + } + + public void setErpId(String erpId) { + this.erpId = erpId; + } + + public String getErpName() { + return erpName; + } + + public void setErpName(String erpName) { + this.erpName = erpName; + } + + public String getUuid() { + return uuid; + } + + public void setUuid(String uuid) { + this.uuid = uuid; + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/udid/ScheduledRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/info/ScheduledRequest.java similarity index 76% rename from api-admin/src/main/java/com/glxp/api/admin/req/udid/ScheduledRequest.java rename to api-admin/src/main/java/com/glxp/api/admin/req/info/ScheduledRequest.java index 8f69633b..0e9280c5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/udid/ScheduledRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/info/ScheduledRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.udid; +package com.glxp.api.admin.req.info; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/ErpOnhandRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/ErpOnhandRequest.java index 86b5c44d..426d2a6b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/ErpOnhandRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/ErpOnhandRequest.java @@ -11,4 +11,7 @@ public class ErpOnhandRequest { private String warehouseCode; private String inventoryCode; private List inventoryCodes; + + private String udiCode; + private String nameCode; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/ErpInvProductResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/inventory/ErpInvProductResponse.java new file mode 100644 index 00000000..5cba53c0 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/inventory/ErpInvProductResponse.java @@ -0,0 +1,15 @@ +package com.glxp.api.admin.res.inventory; + +import lombok.Data; + +@Data +public class ErpInvProductResponse { + + private String code; + private String batchNo; + private String manufacturingDate; + private String expirationDate; + private String warehouseCode; + private String warehouseName; + private String count; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java index a5c76ece..0feb83b3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java @@ -23,8 +23,11 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService { if (filterUdiInfoRequest == null) { return Collections.emptyList(); } - int offset = (filterUdiInfoRequest.getPage() - 1) * filterUdiInfoRequest.getLimit(); - PageHelper.offsetPage(offset, filterUdiInfoRequest.getLimit()); + if(filterUdiInfoRequest.getPage()!=null){ + int offset = (filterUdiInfoRequest.getPage() - 1) * filterUdiInfoRequest.getLimit(); + PageHelper.offsetPage(offset, filterUdiInfoRequest.getLimit()); + } + List data = udiRelevanceDao.filterUdiRelevance(filterUdiInfoRequest); return data; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/SetupService.java b/api-admin/src/main/java/com/glxp/api/admin/service/info/SetupService.java deleted file mode 100644 index 94175d66..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/SetupService.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.glxp.api.admin.service.info; - -import com.glxp.api.admin.entity.info.SetupEntity; -import com.glxp.api.admin.req.info.FilterSetupRequest; -import lombok.Data; - -import java.util.List; - - -public interface SetupService { - - SetupEntity selectSetup(); - - SetupEntity findSetup(FilterSetupRequest filterSetupRequest); - - boolean modifySetup(SetupEntity setupEntity); - - boolean insertSetup(SetupEntity setupEntity); -} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SetupServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SetupServiceImpl.java deleted file mode 100644 index a1044c57..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SetupServiceImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.glxp.api.admin.service.info.impl; - -import com.glxp.api.admin.dao.info.SetupDao; -import com.glxp.api.admin.entity.info.SetupEntity; -import com.glxp.api.admin.req.info.FilterSetupRequest; -import com.glxp.api.admin.service.info.SetupService; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.List; - -@Service -public class SetupServiceImpl implements SetupService { - @Resource - SetupDao setupDao; - - - @Override - public SetupEntity selectSetup() { - FilterSetupRequest filterSetupRequest = new FilterSetupRequest(); - filterSetupRequest.setId(1); - return setupDao.findSetup(filterSetupRequest); - } - - @Override - public SetupEntity findSetup(FilterSetupRequest filterSetupRequest) { - return setupDao.findSetup(filterSetupRequest); - } - - @Override - public boolean modifySetup(SetupEntity setupEntity) { - - return setupDao.modifySetup(setupEntity); - } - - @Override - public boolean insertSetup(SetupEntity setupEntity) { - return setupDao.insertSetup(setupEntity); - } -} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvErpStockService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvErpStockService.java deleted file mode 100644 index ba79febd..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvErpStockService.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.glxp.api.admin.service.inventory; - -import com.glxp.api.admin.entity.basic.ErpStockEntity; -import com.glxp.api.admin.req.basic.FilterStockprintRequest; - -import java.util.List; - -public interface InvErpStockService { - - - ErpStockEntity findByCode(String nameCode,String batchNo); - - boolean insertErpStock(ErpStockEntity stockPrintEntity); - - boolean insertErpStocks(List stockPrintEntities); - - boolean updateErpStock(ErpStockEntity udiInfoEntity); - - boolean deleteById(String id); - -} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvStockPrintService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvStockPrintService.java index 29d33614..b9113a76 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvStockPrintService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvStockPrintService.java @@ -1,6 +1,6 @@ package com.glxp.api.admin.service.inventory; -import com.glxp.api.admin.entity.basic.StockPrintEntity; +import com.glxp.api.admin.entity.inventory.StockPrintEntity; import com.glxp.api.admin.req.basic.FilterStockprintRequest; import java.util.List; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvErpStockServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvErpStockServiceImpl.java deleted file mode 100644 index 9830b05b..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvErpStockServiceImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.glxp.api.admin.service.inventory.impl; - -import com.glxp.api.admin.dao.inventory.InvErpStockDao; -import com.glxp.api.admin.entity.basic.ErpStockEntity; -import com.glxp.api.admin.service.inventory.InvErpStockService; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.List; - -@Service -public class InvErpStockServiceImpl implements InvErpStockService { - - @Resource - InvErpStockDao erpStockDao; - - @Override - public ErpStockEntity findByCode(String nameCode, String batchNo) { - return erpStockDao.findByCode(nameCode, batchNo); - } - - @Override - public boolean insertErpStock(ErpStockEntity erpStockEntity) { - return erpStockDao.insertErpStock(erpStockEntity); - } - - @Override - public boolean insertErpStocks(List erpStockEntities) { - return erpStockDao.insertErpStocks(erpStockEntities); - } - - @Override - public boolean updateErpStock(ErpStockEntity erpStockEntity) { - return erpStockDao.updateErpStock(erpStockEntity); - } - - @Override - public boolean deleteById(String id) { - return erpStockDao.deleteById(id); - } -} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvStockPrintServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvStockPrintServiceImpl.java index 8a057d9b..0f7bb27e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvStockPrintServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvStockPrintServiceImpl.java @@ -2,7 +2,7 @@ package com.glxp.api.admin.service.inventory.impl; import com.github.pagehelper.PageHelper; import com.glxp.api.admin.dao.inventory.InvStockPrintDao; -import com.glxp.api.admin.entity.basic.StockPrintEntity; +import com.glxp.api.admin.entity.inventory.StockPrintEntity; import com.glxp.api.admin.req.basic.FilterStockprintRequest; import com.glxp.api.admin.service.inventory.InvStockPrintService; import com.glxp.api.admin.util.FilterUdiUtils; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateErpDataTask.java b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateErpDataTask.java index 9d31078f..ce89f33b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateErpDataTask.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateErpDataTask.java @@ -2,10 +2,8 @@ package com.glxp.api.admin.thread; import com.glxp.api.admin.dao.info.ScheduledDao; import com.glxp.api.admin.entity.info.ScheduledEntity; -import com.glxp.api.admin.entity.info.SetupEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.req.udid.ScheduledRequest; -import com.glxp.api.admin.service.info.SetupService; +import com.glxp.api.admin.req.info.ScheduledRequest; import com.glxp.api.admin.service.info.SystemParamConfigService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/InvDlErpStockService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/InvDlErpStockService.java deleted file mode 100644 index 84b1d5cf..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/InvDlErpStockService.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.glxp.api.admin.thread; - -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.entity.inout.ErpOrderEntity; -import com.glxp.api.admin.httpclient.ErpOrderClient; -import com.glxp.api.admin.req.inout.FilterOrderRequest; -import com.glxp.api.admin.entity.basic.ErpStockEntity; -import com.glxp.api.admin.entity.basic.UdiInfoEntity; -import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; -import com.glxp.api.admin.entity.info.SetupEntity; -import com.glxp.api.admin.entity.inout.WarehouseEntity; -import com.glxp.api.admin.req.inout.WarehouseQueryRequest; -import com.glxp.api.admin.service.info.SystemParamConfigService; -import com.glxp.api.admin.service.inventory.InvErpStockService; -import com.glxp.api.admin.service.basic.UdiInfoService; -import com.glxp.api.admin.service.basic.UdiRelevanceService; -import com.glxp.api.admin.service.info.SetupService; -import com.glxp.api.admin.service.inout.CodesService; -import com.glxp.api.admin.util.DateUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -@Service -public class InvDlErpStockService { - @Resource - SetupService setupService; - @Resource - InvErpStockService erpStockService; - @Resource - UdiRelevanceService udiRelevanceService; - @Resource - UdiInfoService udiInfoService; - @Resource - CodesService warehouseService; - @Resource - SystemParamConfigService systemParamConfigService; - final Logger logger = LoggerFactory.getLogger(InvDlErpStockService.class); - - /** - * 下载ERP采购入库单所有产品信息到ERP库存表 - */ - @Async - public void dlErpStock() { - SetupEntity setupEntity = setupService.selectSetup(); - Integer day = setupEntity.getDlStockErpDay(); - Map date = DateUtil.getDayRange(day); - Integer page = 1; - Integer limit = 20; - - while (true) { - - SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_order_query"); - if (systemParamConfigEntity == null) { - logger.error("ERP出入库单据接口未定义"); - return; - } - FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); - filterOrderRequest.setPage(page); - filterOrderRequest.setLimit(limit); - filterOrderRequest.setStartDate((String)date.get("startDate")); - filterOrderRequest.setEndDate((String)date.get("endDate")); - filterOrderRequest.setBillAction("PurchaseWareHouseIn"); - List erpOrderEntities = new ErpOrderClient(systemParamConfigEntity.getParamValue()).getErpOrder(filterOrderRequest); - List erpStockEntities = new ArrayList<>(); - if (erpOrderEntities != null && erpOrderEntities.size() > 0) { - page++; - for (ErpOrderEntity erpOrderEntity : erpOrderEntities) { - //ERP数据更新 - ErpStockEntity erpStockEntity = new ErpStockEntity(); - erpStockEntity.setOrderId(erpOrderEntity.getErpOrderId()); - erpStockEntity.setCode(erpOrderEntity.getGoodsid()); - erpStockEntity.setBatchNo(erpOrderEntity.getBatchNo()); - erpStockEntity.setExpirationDate(erpOrderEntity.getExpireDate()); - erpStockEntity.setName(erpOrderEntity.getGoodsname()); - erpStockEntity.setCount(erpOrderEntity.getCount() + ""); - - //本地数据更新 - UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(erpStockEntity.getCode()); - if (udiRelevanceEntity != null) { - UdiInfoEntity udiInfoEntity = udiInfoService.findByUuid(udiRelevanceEntity.getUuid()); - WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest(); - warehouseQueryRequest.setUdi(udiInfoEntity.getNameCode()); - warehouseQueryRequest.setBatchNo(erpStockEntity.getBatchNo()); - List warehouseEntities = warehouseService.findByOrderId(warehouseQueryRequest); - if (warehouseEntities != null && warehouseEntities.size() > 0) { - erpStockEntity.setManufacturingDate(warehouseEntities.get(0).getProduceDate()); - erpStockEntity.setExpirationDate(warehouseEntities.get(0).getExpireDate()); - } - } - erpStockEntities.add(erpStockEntity); - erpStockService.insertErpStocks(erpStockEntities); - } - } else { - break; - } - } - - } - - -} diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/InvImportStockService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/InvImportStockService.java index a3257adc..8aa03a5e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/InvImportStockService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/InvImportStockService.java @@ -1,32 +1,32 @@ package com.glxp.api.admin.thread; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.TypeReference; import com.glxp.api.admin.constant.ConstantType; -import com.glxp.api.admin.entity.basic.ErpStockEntity; -import com.glxp.api.admin.entity.basic.StockPrintEntity; import com.glxp.api.admin.entity.basic.UdiInfoEntity; import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; -import com.glxp.api.admin.entity.inout.OrderEntity; +import com.glxp.api.admin.entity.info.SystemParamConfigEntity; import com.glxp.api.admin.entity.inout.ErpOrderEntity; import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; +import com.glxp.api.admin.entity.inout.OrderEntity; +import com.glxp.api.admin.entity.inventory.ErpStockEntity; +import com.glxp.api.admin.entity.inventory.StockPrintEntity; +import com.glxp.api.admin.httpclient.ErpInvClient; import com.glxp.api.admin.req.basic.FilterStockprintRequest; import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; import com.glxp.api.admin.req.inout.FilterStockCheckRequest; import com.glxp.api.admin.req.inout.OrderFilterRequest; -import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.UOnhandQueryResponse; +import com.glxp.api.admin.req.inventory.ErpOnhandRequest; import com.glxp.api.admin.res.basic.UdiRelevanceResponse; -import com.glxp.api.admin.service.inventory.InvErpStockService; -import com.glxp.api.admin.service.inventory.InvStockPrintService; +import com.glxp.api.admin.res.inventory.ErpInvProductResponse; +import com.glxp.api.admin.res.inventory.ErpOnHandResponse; import com.glxp.api.admin.service.basic.UdiInfoService; import com.glxp.api.admin.service.basic.UdiRelevanceService; +import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.service.inout.OrderDetailService; import com.glxp.api.admin.service.inout.OrderService; -import com.glxp.api.admin.util.HttpClient; -import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.admin.service.inventory.InvStockPrintService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -39,9 +39,6 @@ import java.util.stream.Collectors; @Service public class InvImportStockService { - - @Value("${UCLOD_SERVER_URL}") - private String ucloudUrl; @Resource private OrderService orderService; @Resource @@ -53,7 +50,8 @@ public class InvImportStockService { @Resource private UdiInfoService productInfoService; @Resource - private InvErpStockService erpStockService; + private SystemParamConfigService systemParamConfigService; + final Logger logger = LoggerFactory.getLogger(InvImportStockService.class); @Async public void updateStock() { @@ -61,101 +59,81 @@ public class InvImportStockService { int page = 1; int limit = 1000; FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); - while (true) { - filterUdiInfoRequest.setPage(page); - filterUdiInfoRequest.setLimit(limit); - List udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest); - if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) { - List stockPrintEntities = new ArrayList<>(); - for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) { - - Map paramMap = new HashMap<>(16); - paramMap.put("inventory", udiRelevanceResponse.getThirdId()); - String response = HttpClient.mipsGet(ucloudUrl + "/uclooud/basic/onhandQuery", paramMap); - try { - BaseResponse> onHandsResponse = - JSONObject.parseObject(response, new TypeReference>>() { - }); - List uOnhandQueryResponses = onHandsResponse.getData().getList(); + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_inv_product_query"); + String url; + if (systemParamConfigEntity != null) { + url = systemParamConfigEntity.getParamValue(); + while (true) { + filterUdiInfoRequest.setPage(page); + filterUdiInfoRequest.setLimit(limit); + List udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest); + if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) { + List stockPrintEntities = new ArrayList<>(); + for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) { + ErpOnhandRequest erpOnhandRequest = new ErpOnhandRequest(); + erpOnhandRequest.setInventoryCode(udiRelevanceResponse.getThirdId()); + List uOnhandQueryResponses = new ErpInvClient().getInvPrdoduct(erpOnhandRequest, url); if (uOnhandQueryResponses != null && uOnhandQueryResponses.size() > 0) { - - for (UOnhandQueryResponse onhandQueryResponse : uOnhandQueryResponses) { + for (ErpInvProductResponse onhandQueryResponse : uOnhandQueryResponses) { StockPrintEntity stockPrintEntity = new StockPrintEntity(); - stockPrintEntity.setBatchNo(onhandQueryResponse.getVbatchcode()); - stockPrintEntity.setNnum(onhandQueryResponse.getNnum() + ""); - stockPrintEntity.setWarehouseName(onhandQueryResponse.getCwarehouse_name()); - stockPrintEntity.setWarehouseCode(onhandQueryResponse.getCwarehouse_code()); - ErpStockEntity erpStockEntity = erpStockService.findByCode(udiRelevanceResponse.getThirdId(), stockPrintEntity.getBatchNo()); - if (erpStockEntity != null) { - stockPrintEntity.setExpireDate(erpStockEntity.getExpirationDate()); - stockPrintEntity.setProduceDate(erpStockEntity.getManufacturingDate()); - } + stockPrintEntity.setBatchNo(onhandQueryResponse.getBatchNo()); + stockPrintEntity.setNnum(onhandQueryResponse.getCount()); + stockPrintEntity.setWarehouseName(onhandQueryResponse.getWarehouseName()); + stockPrintEntity.setWarehouseCode(onhandQueryResponse.getWarehouseCode()); + stockPrintEntity.setExpireDate(onhandQueryResponse.getExpirationDate()); + stockPrintEntity.setProduceDate(onhandQueryResponse.getManufacturingDate()); setCommonparams(stockPrintEntity, udiRelevanceResponse, stockPrintEntities); } - } else { StockPrintEntity stockPrintEntity = new StockPrintEntity(); setCommonparams(stockPrintEntity, udiRelevanceResponse, stockPrintEntities); } - } catch (Exception e) { - e.printStackTrace(); - StockPrintEntity stockPrintEntity = new StockPrintEntity(); - setCommonparams(stockPrintEntity, udiRelevanceResponse, stockPrintEntities); - } - } - stockPrintService.insertStockPrints(stockPrintEntities); - if (udiRelevanceResponses.size() < limit) { - break; + } + stockPrintService.insertStockPrints(stockPrintEntities); + if (udiRelevanceResponses.size() < limit) { + break; + } else { + page++; + } } else { - page++; + break; } - } else { - break; } + } else { + logger.error("ERP库存产品信息查询接口地址未定义！"); } + } @Async - public void updateByCode(String code) { + public void updateByCode(String code, String url) { UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(code); UdiRelevanceResponse udiRelevanceResponse = new UdiRelevanceResponse(); BeanUtils.copyProperties(udiRelevanceEntity, udiRelevanceResponse); List stockPrintEntities = new ArrayList<>(); - Map paramMap = new HashMap<>(16); - paramMap.put("inventory", code); - String response = HttpClient.mipsGet(ucloudUrl + "/uclooud/basic/onhandQuery", paramMap); - try { - BaseResponse> onHandsResponse = - JSONObject.parseObject(response, new TypeReference>>() { - }); - List uOnhandQueryResponses = onHandsResponse.getData().getList(); - if (uOnhandQueryResponses != null && uOnhandQueryResponses.size() > 0) { - - for (UOnhandQueryResponse onhandQueryResponse : uOnhandQueryResponses) { - StockPrintEntity stockPrintEntity = new StockPrintEntity(); - stockPrintEntity.setBatchNo(onhandQueryResponse.getVbatchcode()); - stockPrintEntity.setNnum(onhandQueryResponse.getNnum() + ""); - stockPrintEntity.setWarehouseName(onhandQueryResponse.getCwarehouse_name()); - stockPrintEntity.setWarehouseCode(onhandQueryResponse.getCwarehouse_code()); - ErpStockEntity erpStockEntity = erpStockService.findByCode(udiRelevanceResponse.getThirdId(), stockPrintEntity.getBatchNo()); - if (erpStockEntity != null) { - stockPrintEntity.setExpireDate(erpStockEntity.getExpirationDate()); - stockPrintEntity.setProduceDate(erpStockEntity.getManufacturingDate()); - } - setCommonparams(stockPrintEntity, udiRelevanceResponse, stockPrintEntities); - } + ErpOnhandRequest erpOnhandRequest = new ErpOnhandRequest(); + erpOnhandRequest.setInventoryCode(udiRelevanceResponse.getThirdId()); + List uOnhandQueryResponses = new ErpInvClient().getInvPrdoduct(erpOnhandRequest, url); + if (uOnhandQueryResponses != null && uOnhandQueryResponses.size() > 0) { - } else { + for (ErpInvProductResponse onhandQueryResponse : uOnhandQueryResponses) { StockPrintEntity stockPrintEntity = new StockPrintEntity(); + stockPrintEntity.setBatchNo(onhandQueryResponse.getBatchNo()); + stockPrintEntity.setNnum(onhandQueryResponse.getCount() + ""); + stockPrintEntity.setWarehouseName(onhandQueryResponse.getWarehouseName()); + stockPrintEntity.setWarehouseCode(onhandQueryResponse.getWarehouseCode()); + stockPrintEntity.setExpireDate(onhandQueryResponse.getExpirationDate()); + stockPrintEntity.setProduceDate(onhandQueryResponse.getManufacturingDate()); setCommonparams(stockPrintEntity, udiRelevanceResponse, stockPrintEntities); } - } catch (Exception e) { - e.printStackTrace(); + + } else { StockPrintEntity stockPrintEntity = new StockPrintEntity(); setCommonparams(stockPrintEntity, udiRelevanceResponse, stockPrintEntities); } + } public void setCommonparams(StockPrintEntity stockPrintEntity, UdiRelevanceResponse udiRelevanceResponse, List stockPrintEntities) { @@ -245,53 +223,56 @@ public class InvImportStockService { @Async public void checkStock(FilterStockCheckRequest filterStockCheckRequest) { - List erpOrderEntitie = getErpOrders(filterStockCheckRequest.getId() + ""); - if (erpOrderEntitie != null && erpOrderEntitie.size() > 0) { - for (ErpOrderEntity erpOrderEntity : erpOrderEntitie) { - //获取UUID - FilterUdiInfoRequest productFilterRequest = new FilterUdiInfoRequest(); - productFilterRequest.setNameCode(erpOrderEntity.getNameCode()); - List productInfoEntities = productInfoService.filterAllUdiInfo(productFilterRequest); - Map> groupBy = productInfoEntities.stream().collect(Collectors.groupingBy(UdiInfoEntity::getUuid)); - List uuids = new ArrayList<>(); - for (String uuid : groupBy.keySet()) { - uuids.add(uuid); - } - if (uuids.size() == 1) { - List udiRelevanceEntities = udiRelevanceService.selectByUuid(uuids.get(0)); - if (udiRelevanceEntities != null && udiRelevanceEntities.size() == 1) { - Map paramMap = new HashMap<>(16); - paramMap.put("inventory", udiRelevanceEntities.get(0).getThirdId()); - String response = HttpClient.mipsGet(ucloudUrl + "/uclooud/basic/onhandQuery", paramMap); - try { - BaseResponse> onHandsResponse = - JSONObject.parseObject(response, new TypeReference>>() { - }); - List uOnhandQueryResponses = onHandsResponse.getData().getList(); - if (uOnhandQueryResponses != null && uOnhandQueryResponses.size() > 0) { - for (int i = 0; i < uOnhandQueryResponses.size(); i++) { - if (uOnhandQueryResponses.get(i).getVbatchcode().equals(erpOrderEntity.getBatchNo()) + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_inv_product_query"); + String url; + if (systemParamConfigEntity != null) { + url = systemParamConfigEntity.getParamValue(); + + List erpOrderEntitie = getErpOrders(filterStockCheckRequest.getId() + ""); + if (erpOrderEntitie != null && erpOrderEntitie.size() > 0) { + for (ErpOrderEntity erpOrderEntity : erpOrderEntitie) { + //获取UUID + FilterUdiInfoRequest productFilterRequest = new FilterUdiInfoRequest(); + productFilterRequest.setNameCode(erpOrderEntity.getNameCode()); + List productInfoEntities = productInfoService.filterAllUdiInfo(productFilterRequest); + Map> groupBy = productInfoEntities.stream().collect(Collectors.groupingBy(UdiInfoEntity::getUuid)); + List uuids = new ArrayList<>(); + for (String uuid : groupBy.keySet()) { + uuids.add(uuid); + } + if (uuids.size() == 1) { + List udiRelevanceEntities = udiRelevanceService.selectByUuid(uuids.get(0)); + if (udiRelevanceEntities != null && udiRelevanceEntities.size() == 1) { + ErpOnhandRequest erpOnhandRequest = new ErpOnhandRequest(); + erpOnhandRequest.setInventoryCode(udiRelevanceEntities.get(0).getThirdId()); + List erpOnHandResponses = new ErpInvClient().getOnHand(erpOnhandRequest, url); + if (erpOnHandResponses != null && erpOnHandResponses.size() > 0) { + for (int i = 0; i < erpOnHandResponses.size(); i++) { + if (erpOnHandResponses.get(i).getBatchNo().equals(erpOrderEntity.getBatchNo()) ) { - if (erpOrderEntity.getWarehouseCode() != null && uOnhandQueryResponses.get(i).getCwarehouse_code().equals(erpOrderEntity.getWarehouseCode())) - erpOrderEntity.setReCount(uOnhandQueryResponses.get(i).getNnum()); + if (erpOrderEntity.getWarehouseCode() != null && erpOnHandResponses.get(i).getWarehouseCode().equals(erpOrderEntity.getWarehouseCode())) + erpOrderEntity.setReCount(erpOnHandResponses.get(i).getCount()); else { - erpOrderEntity.setReCount(uOnhandQueryResponses.get(i).getNnum()); + erpOrderEntity.setReCount(erpOnHandResponses.get(i).getCount()); } myErpOrderService.updateErpOrder(erpOrderEntity); + break; } } } - } catch (Exception e) { - e.printStackTrace(); + } } - } + } } + } else { + logger.error("ERP库存产品信息查询接口地址未定义！"); } } + private List getErpOrders(String id) { List orderIds = getOrderIds(id + ""); List erpOrderEntities = new ArrayList<>(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock1Task.java b/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock1Task.java index 83e37f3e..ab55430f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock1Task.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock1Task.java @@ -2,8 +2,7 @@ package com.glxp.api.admin.thread; import com.glxp.api.admin.dao.info.ScheduledDao; import com.glxp.api.admin.entity.info.ScheduledEntity; -import com.glxp.api.admin.req.udid.ScheduledRequest; -import com.glxp.api.admin.service.info.SetupService; +import com.glxp.api.admin.req.info.ScheduledRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.scheduling.annotation.EnableScheduling; @@ -24,8 +23,6 @@ public class InvUpdateStock1Task implements SchedulingConfigurer { private InvImportStockService importStockService; @Resource protected ScheduledDao scheduledDao; - @Resource - SetupService setupService; @Override public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock2Task.java b/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock2Task.java index 90ddf5d7..348caea7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock2Task.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock2Task.java @@ -2,8 +2,7 @@ package com.glxp.api.admin.thread; import com.glxp.api.admin.dao.info.ScheduledDao; import com.glxp.api.admin.entity.info.ScheduledEntity; -import com.glxp.api.admin.req.udid.ScheduledRequest; -import com.glxp.api.admin.service.info.SetupService; +import com.glxp.api.admin.req.info.ScheduledRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.scheduling.annotation.EnableScheduling; @@ -24,8 +23,6 @@ public class InvUpdateStock2Task implements SchedulingConfigurer { private InvImportStockService importStockService; @Resource protected ScheduledDao scheduledDao; - @Resource - SetupService setupService; @Override public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/InvDlErpStockTask.java b/api-admin/src/main/java/com/glxp/api/admin/thread/IoErpCheckTask.java similarity index 74% rename from api-admin/src/main/java/com/glxp/api/admin/thread/InvDlErpStockTask.java rename to api-admin/src/main/java/com/glxp/api/admin/thread/IoErpCheckTask.java index 2d87eded..69f62de3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/InvDlErpStockTask.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/IoErpCheckTask.java @@ -2,8 +2,7 @@ package com.glxp.api.admin.thread; import com.glxp.api.admin.dao.info.ScheduledDao; import com.glxp.api.admin.entity.info.ScheduledEntity; -import com.glxp.api.admin.req.udid.ScheduledRequest; -import com.glxp.api.admin.service.info.SetupService; +import com.glxp.api.admin.req.info.ScheduledRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.scheduling.annotation.EnableScheduling; @@ -16,19 +15,20 @@ import javax.annotation.Resource; @Component @EnableScheduling -public class InvDlErpStockTask implements SchedulingConfigurer { +public class IoErpCheckTask implements SchedulingConfigurer { + + final Logger logger = LoggerFactory.getLogger(IoErpCheckTask.class); @Resource protected ScheduledDao scheduledDao; @Resource - InvDlErpStockService dlErpStockService; - final Logger logger = LoggerFactory.getLogger(IoModifyErpTask.class); + private IoTransInoutService ioTransInoutService; @Override public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) { scheduledTaskRegistrar.addTriggerTask(() -> process(), triggerContext -> { ScheduledRequest scheduledRequest = new ScheduledRequest(); - scheduledRequest.setCronName("dlStockEr"); + scheduledRequest.setCronName("erpCheck"); ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest); String cron = scheduledEntity.getCron(); if (cron.isEmpty()) { @@ -39,7 +39,7 @@ public class InvDlErpStockTask implements SchedulingConfigurer { } private void process() { - logger.info("定时下载ERP采购订单到入库存"); - dlErpStockService.dlErpStock(); + logger.info("定时校验ERP单"); + ioTransInoutService.checkOrder(); } -} +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/IoModifyErpTask.java b/api-admin/src/main/java/com/glxp/api/admin/thread/IoModifyErpTask.java index b753e024..90f23a42 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/IoModifyErpTask.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/IoModifyErpTask.java @@ -6,21 +6,18 @@ import com.glxp.api.admin.entity.info.SystemParamConfigEntity; import com.glxp.api.admin.httpclient.ErpOrderClient; import com.glxp.api.admin.dao.info.ScheduledDao; import com.glxp.api.admin.entity.info.ScheduledEntity; -import com.glxp.api.admin.entity.info.SetupEntity; import com.glxp.api.admin.entity.inout.OrderEntity; import com.glxp.api.admin.entity.inout.ErpOrderEntity; import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; import com.glxp.api.admin.req.inout.OrderFilterRequest; import com.glxp.api.admin.req.inout.USignRequest; -import com.glxp.api.admin.req.udid.ScheduledRequest; -import com.glxp.api.admin.service.info.SetupService; +import com.glxp.api.admin.req.info.ScheduledRequest; import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.service.inout.OrderDetailService; import com.glxp.api.admin.service.inout.OrderService; import com.glxp.api.common.res.BaseResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.SchedulingConfigurer; import org.springframework.scheduling.config.ScheduledTaskRegistrar; @@ -32,10 +29,6 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -/** - * 定时上传到ali接口 - */ - @Component @EnableScheduling public class IoModifyErpTask implements SchedulingConfigurer { @@ -45,8 +38,6 @@ public class IoModifyErpTask implements SchedulingConfigurer { @Resource protected ScheduledDao scheduledDao; @Resource - SetupService setupService; - @Resource private OrderService orderService; @Resource OrderDetailService myErpOrderService; @@ -74,8 +65,11 @@ public class IoModifyErpTask implements SchedulingConfigurer { } public void modifyErp() { - SetupEntity setupEntity = setupService.selectSetup(); - if (setupEntity.isErpPruchaseModify() || setupEntity.isErpSaleOutModify()) { + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erpSaleOutModify"); + String isErpSaleOutModify = systemParamConfigEntity.getParamValue(); + systemParamConfigEntity = systemParamConfigService.selectByParamKey("erpPruchaseModify"); + String isErpPruchaseModify = systemParamConfigEntity.getParamValue(); + if ("1".equals(isErpSaleOutModify)|| "1".equals(isErpPruchaseModify)) { OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); orderFilterRequest.setExportStatus(ConstantStatus.ORDER_EXPORT_UN); orderFilterRequest.setContrastStatus(ConstantStatus.ORDER_CHECK_SUCCESS); @@ -87,21 +81,21 @@ public class IoModifyErpTask implements SchedulingConfigurer { filterErpOrderRequest.setLimit(100); filterErpOrderRequest.setOrderId(orderEntity.getId()); List erpOrderEntities = myErpOrderService.filterMyErpOrder(filterErpOrderRequest); - SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_order_modify"); + SystemParamConfigEntity systemParamConfigEntity1 = systemParamConfigService.selectByParamKey("erp_order_modify"); - if (systemParamConfigEntity != null) { - String url = systemParamConfigEntity.getParamValue(); + if (systemParamConfigEntity1 != null) { + String url = systemParamConfigEntity1.getParamValue(); if (erpOrderEntities != null && !erpOrderEntities.isEmpty()) { Map> listMap = erpOrderEntities.stream().collect(Collectors.groupingBy(ErpOrderEntity::getErpOrderId)); if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { - if (setupEntity.isErpSaleOutModify()) { + if ("1".equals(isErpSaleOutModify)) { BaseResponse baseResponse = new ErpOrderClient().postBill(listMap, orderEntity.getAction(), url); if (baseResponse != null && baseResponse.getCode() == 20000) { orderService.updateExportStatus(orderEntity.getId(), ConstantStatus.ORDER_EXPORT_ED); } } } else { - if (setupEntity.isErpPruchaseModify()) { + if ("1".equals(isErpPruchaseModify)) { BaseResponse baseResponse = new ErpOrderClient().postBill(listMap, orderEntity.getAction(), url); if (baseResponse != null && baseResponse.getCode() == 20000) { orderService.updateExportStatus(orderEntity.getId(), ConstantStatus.ORDER_EXPORT_ED); @@ -115,16 +109,14 @@ public class IoModifyErpTask implements SchedulingConfigurer { } } - - OrderFilterRequest signFilterRequest = new OrderFilterRequest(); signFilterRequest.setSignStatus(ConstantStatus.ORDER_SIGN_UN); signFilterRequest.setContrastStatus(ConstantStatus.ORDER_CHECK_SUCCESS); List signsOrderEntities = orderService.findAllOrders(signFilterRequest); if (signsOrderEntities != null && signsOrderEntities.size() > 0) { - SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_order_sign"); - if(systemParamConfigEntity!=null){ - String url = systemParamConfigEntity.getParamValue(); + SystemParamConfigEntity systemParamConfigEntity2 = systemParamConfigService.selectByParamKey("erp_order_sign"); + if (systemParamConfigEntity2 != null) { + String url = systemParamConfigEntity2.getParamValue(); for (OrderEntity orderEntity : signsOrderEntities) { FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest(); filterErpOrderRequest.setOrderId(orderEntity.getId()); @@ -132,7 +124,7 @@ public class IoModifyErpTask implements SchedulingConfigurer { if (erpOrderEntities != null && !erpOrderEntities.isEmpty()) { Map> listMap = erpOrderEntities.stream().collect(Collectors.groupingBy(ErpOrderEntity::getErpOrderId)); if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { - if (setupEntity.isErpSaleOutSign()) { + if ("1".equals(isErpSaleOutModify)) { if (listMap != null && listMap.size() > 0) { for (String key : listMap.keySet()) { USignRequest signRequest = new USignRequest(); @@ -146,7 +138,7 @@ public class IoModifyErpTask implements SchedulingConfigurer { } } } else { - if (setupEntity.isErpPruchaseSign()) { + if ("1".equals(isErpPruchaseModify)) { if (listMap != null && listMap.size() > 0) { for (String key : listMap.keySet()) { USignRequest signRequest = new USignRequest(); @@ -162,14 +154,11 @@ public class IoModifyErpTask implements SchedulingConfigurer { } } } - }else { + } else { logger.error("ERP单据签字接口地址未定义"); } - } } - - } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutTask.java b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutTask.java index ccabb2f1..ecde06b7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutTask.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutTask.java @@ -2,8 +2,7 @@ package com.glxp.api.admin.thread; import com.glxp.api.admin.dao.info.ScheduledDao; import com.glxp.api.admin.entity.info.ScheduledEntity; -import com.glxp.api.admin.req.udid.ScheduledRequest; -import com.glxp.api.admin.service.info.SetupService; +import com.glxp.api.admin.req.info.ScheduledRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.scheduling.annotation.EnableScheduling; diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties index 6e77cf8a..f47c0e2c 100644 --- a/api-admin/src/main/resources/application-dev.properties +++ b/api-admin/src/main/resources/application-dev.properties @@ -2,9 +2,10 @@ server.port=9991 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +#spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms_new?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.username=root spring.datasource.password=123456 -#spring.datasource.password=mysql80 +#spring.datasource.password=root server.servlet.context-path= logging.level.com.glxp.api.admin.dao=debug @@ -17,10 +18,6 @@ logging.path=output/logs logging.file=D:/udi.log #UDI数据下载 UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server -#UDI_SERVER_URL=http://139.9.178.73:8080/UDI_DL_Server -#UCLOD服务 -#UCLOD_SERVER_URL=http://127.0.0.1:9997 -UCLOD_SERVER_URL=http://127.0.0.1:8080/UDIC_UCLOUD_SERVER 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 e8544fc5..59c09e8d 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -35,6 +35,9 @@ AND uuid = #{uuid} + + AND basic_udirel.id = #{id} + ORDER BY updateTime DESC diff --git a/api-admin/src/main/resources/mybatis/mapper/info/CompanyDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/CompanyDao.xml index cb0ba302..a3e24b3d 100644 --- a/api-admin/src/main/resources/mybatis/mapper/info/CompanyDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/info/CompanyDao.xml @@ -6,11 +6,11 @@ - UPDATE company SET + UPDATE auth_company SET name = #{name}, category = #{category}, creditCode = #{creditCode}, @@ -22,7 +22,7 @@ - INSERT INTO company(name,category,creditCode,addr,productAddr,classes,appId,appSecret) values + INSERT INTO auth_company(name,category,creditCode,addr,productAddr,classes,appId,appSecret) values ( #{name}, #{category}, #{creditCode}, diff --git a/api-admin/src/main/resources/mybatis/mapper/info/ScheduleDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/ScheduleDao.xml index 951ad044..0225f3fb 100644 --- a/api-admin/src/main/resources/mybatis/mapper/info/ScheduleDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/info/ScheduleDao.xml @@ -6,7 +6,7 @@ - insert INTO scheduled + insert INTO sys_scheduled (cronName,cron,customerId) values ( @@ -18,13 +18,13 @@ - delete from scheduled where id = #{id} + delete from sys_scheduled where id = #{id} - - SELECT * FROM system_config WHERE id=#{id} - - - - - UPDATE system_config - - erpSaleOutModify=#{erpSaleOutModify}, - erpGetSaleOut=#{erpGetSaleOut}, - erpSaleOutSign=#{erpSaleOutSign}, - filterSaleOutSign=#{filterSaleOutSign}, - erpGetSaleOutDay=#{erpGetSaleOutDay}, - - erpPruchaseModify=#{erpPruchaseModify}, - erpGetPurchaseIn=#{erpGetPurchaseIn}, - erpPruchaseSign=#{erpPruchaseSign}, - erpGetPurchaseDay=#{erpGetPurchaseDay}, - filterPurchaseSign=#{filterPurchaseSign}, - remark=#{remark}, - forbidSameErp=#{forbidSameErp}, - returnWareHouseOut=#{returnWareHouseOut}, - salesWareHouseOut=#{salesWareHouseOut}, - returnWareHouseIn=#{returnWareHouseIn}, - updateErpData=#{updateErpData}, - dlStockErp=#{dlStockErp}, - dlStockErpDay=#{dlStockErpDay}, - - WHERE id=#{id} - - - - - - insert INTO system_config(erpSaleOutModify, - erpGetSaleOut,erpSaleOutSign,filterSaleOutSign,erpGetSaleOutDay,erpPruchaseModify, - erpGetPurchaseIn,erpPruchaseSign, - erpGetPurchaseDay,filterPurchaseSign,remark,forbidSameErp, - returnWareHouseOut,salesWareHouseOut,returnWareHouseIn,updateErpData,dlStockErp,dlStockErpDay - ) values - ( - #{erpSaleOutModify},#{erpGetSaleOut}, #{erpSaleOutSign}, - #{filterSaleOutSign}, #{erpGetSaleOutDay},#{erpPruchaseModify}, #{erpGetPurchaseIn}, - #{erpPruchaseSign}, - #{erpGetPurchaseDay}, #{filterPurchaseSign}, - #{remark},#{forbidSameErp} - ,#{returnWareHouseOut},#{salesWareHouseOut},#{returnWareHouseIn},#{updateErpData},#{dlStockErp},#{dlStockErpDay}) - - - - \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/info/SystemParamConfigDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/SystemParamConfigDao.xml index e7f21caf..a930df91 100644 --- a/api-admin/src/main/resources/mybatis/mapper/info/SystemParamConfigDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/info/SystemParamConfigDao.xml @@ -6,7 +6,7 @@ - SELECT * FROM system_param_config WHERE id=#{id} + SELECT * FROM sys_param_config WHERE id=#{id} - UPDATE system_param_config + UPDATE sys_param_config paramName=#{paramName}, paramKey=#{paramKey}, @@ -49,7 +49,7 @@ - UPDATE system_param_config + UPDATE sys_param_config paramStatus=#{paramStatus}, @@ -57,7 +57,7 @@ - insert INTO system_param_config(paramName, + insert INTO sys_param_config(paramName, paramKey,paramValue,paramStatus,paramType,paramExplain ) values ( diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvErpStockDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvErpStockDao.xml deleted file mode 100644 index 0c07cb75..00000000 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvErpStockDao.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - replace INTO erpstock - ( - orderId,code,batchNo,manufacturingDate,expirationDate,count,remark,name - ) - values - ( - #{orderId}, - #{code}, - #{batchNo}, - #{manufacturingDate}, - #{count}, - #{remark}, - #{name} - ) - - - - replace INTO erpstock - ( - orderId,code,batchNo,manufacturingDate,expirationDate,count,remark,name - ) - values - - - ( - #{item.orderId}, - #{item.code}, - #{item.batchNo}, - #{item.manufacturingDate}, - #{item.expirationDate}, - #{item.count}, - #{item.remark}, - #{item.name} - ) - - - - - DELETE FROM erpstock WHERE id = #{id} - - - - UPDATE erpstock - - orderId=#{orderId}, - code=#{code}, - batchNo=#{batchNo}, - manufacturingDate=#{manufacturingDate}, - expirationDate=#{expirationDate}, - count=#{count}, - remark=#{remark}, - name=#{name}, - - WHERE id = #{id} - - - - \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvOrderCheckDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvOrderCheckDao.xml index fb6ad438..7c34da8b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvOrderCheckDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvOrderCheckDao.xml @@ -5,7 +5,7 @@ - SELECT * FROM stockprint + resultType="com.glxp.api.admin.entity.inventory.StockPrintEntity"> + SELECT * FROM inv_stockprint @@ -32,17 +32,17 @@ - - replace INTO stockprint + + replace INTO inv_stockprint ( udiCode,udiRlIdFk,nameCode,cpmctymc,batchNo, produceDate,expireDate,serialNo,codeType,thirdId,thirdName, @@ -70,7 +70,7 @@ - replace INTO stockprint + replace INTO inv_stockprint ( udiCode,udiRlIdFk,nameCode,cpmctymc,batchNo, produceDate,expireDate,serialNo,codeType,thirdId,thirdName, @@ -102,11 +102,11 @@ - DELETE FROM stockprint WHERE id = #{id} + DELETE FROM inv_stockprint WHERE id = #{id} - - UPDATE stockprint + + UPDATE inv_stockprint udiCode=#{udiCode}, udiRlIdFk=#{udiRlIdFk}, @@ -132,7 +132,7 @@ - update stockprint + update inv_stockprint set printStatus = 1 WHERE id in diff --git a/api-admin/src/test/java/com/glxp/api/admin/util/DlDeviceTest.java b/api-admin/src/test/java/com/glxp/api/admin/util/DlDeviceTest.java index 0e5df2ab..9f5226a2 100644 --- a/api-admin/src/test/java/com/glxp/api/admin/util/DlDeviceTest.java +++ b/api-admin/src/test/java/com/glxp/api/admin/util/DlDeviceTest.java @@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.glxp.api.admin.httpclient.UdiDlHttpClient; import com.glxp.api.admin.entity.basic.UdiInfoEntity; -import com.glxp.api.admin.entity.udid.*; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/api-common/target/classes/com/glxp/api/common/constant/CacheConstant.class b/api-common/target/classes/com/glxp/api/common/constant/CacheConstant.class index 577b074a536286b4d8c7bab5b87fa485826e84b1..44720484f2ff647faa6f85761b0e4650ffa21315 100644 GIT binary patch delta 113 zcmaFK_>z(L)W2Q(7#J8#7-#5Vr6!k56tEKK zWMmLdOv%m6i%%>q$%rp1%}Fh`QZ1h7t)#}r$iT?J3^a$4L6U)$felEr19?mg9AGgn HFq<0yo9-6G delta 112 zcmaFK_>xiJ)W2Q(7#J8#7b=@6FBR)qs8okx|ydkeh_Xbvi z&Qk5(YG=tM$8nzm#psJJ<~&NAG>rP3VoZ_Rcb9ddU7gRwilj@0s$s%sl3J9oA14fF z6pfcJ8ruu6RrFK6+7Qpva)sBe;!YFP1^+_YUCw%>8A%L$8x zH-CRryNv&zu2$Yt-V#fjsi@>sHsS@!f+l5+i%d%;pW_lUlH=+!v$EcRFju%L>s%9d wu=l62>bju4-VNby3hKl5ev>wo4B1~4U2X}Rv_y=U!EJdh?uhA}RN7+xAK+|TFaQ7m delta 597 zcmZ9IOHUI~7>1uSo%XadLv2Bds1#dJd!=6R0!8p{)mj%O65Nf_K#|l1qj5+40WQic zjPVD!B{5N}3306}6Muj^{0$~vzM&>0PIA8Qec$t)_q=ny*kA4W&%Zxx0h81%;uLL4 zlr<9;p&qH&9OHOUPH0YAM47ZX#p$4wEzWROGo_hUL}ps;mN%;iK5xzn=~l*Mk5BVG|N#AH#y=I`(rwdVmfxBJl>Ol4exm x91=Apy*HJS-rLKHHYO~AY5yXw8P^>CN!H?ss4+t<5i>X{%OEGFc|jqA!e2H-VAcQt diff --git a/api-common/target/classes/com/glxp/api/common/converter/String2LongListConverter.class b/api-common/target/classes/com/glxp/api/common/converter/String2LongListConverter.class index 9c2dfb69ba4580226bdd21cde2a8ec7ece4f61d9..e42ad1dea5c8925d4a108823c0dd56f5bb5dbda7 100644 GIT binary patch delta 639 zcmY+AOHUI~6vuyeX6S9FLxti4eAS8%`oLy4+4(nh1XR=V?GeRVld#HReFA5<0gNNyocT!AZJQsa5_lKKyHH)#3IwXkYu zdtLhI*Q7lLI2bP36Rv?B_Bg^|_}VTPG)EN!(ZDBxzfqcPwHnWF`;P;cA#9fuoYZ7I zPLU1w?YWsG!<^Ba^*Cpyrv4!fNcc5YRx~4jdqzvlKU-dX6!;IDntb@hn%u6vRH_nw zQ?EA3l9T1lu~24xkp=NeqGd^X^1G<*C|wk3(vW0Sq}MIrf)qo7i(JAsV0BBH#U)l( z`L}p!o!=p`g?`V0cD}H~p;~e8P2|SgpBTEo%dv3F$&`YUotcHcypMa&JNMl4-sjY})RixPKJEZ#n745# zBq`dQpk#BBQ(;uroVKwj*utr#ILnykoMv2eUSUmo4bQJCjNy^Rw?EYrW%p|)G?PLK zn#S{Ghh3x<25;6HJ?zDx3)H;SCIzdj z{41R9M1C9N1^PYaR(^Dwj)lU`%Q*dnwfqhpJTtT9-LZ0)O$@;>^-#0W+9b3jy$Y2B*uj0KnQ^l!UEay8%S-` zxOG1)ctjF@fD8YJdsoJ&x2mf8-h29%*y5_-rh1`j)D zoz_w3c)zu|bGWyAs>rV%93Py%QJ9(f`(An##IpM=NkTsbccmBmV+JW&N(m2m=zi*@ z*mKGWj~I3}lgWrt*VJVpj`76uG~pQ)_s*;dafF&5Kkh!7F(FR6EnUuArWNgr^Y-Q2 zx^f@XmvgF2iCe!k%KMc#Bd8@=T+x%>pe{qZF44CkAq_DQn57{oVvZ&zh<`{n@-9>9 zSCW!VuZcckZyD&Ov)2r5H10nKIN!ZvWV><8;~T2o4NnNdqFgpXiAu;-8Q`&@?sjw2 zCw_QJj$wwx=e#&?3R)lwUy|`$eu7^aFQihulzNn0!Th0MdG(Jzv?Z2ar delta 517 zcmXAl&rcIU6vscayY0|rEG-}if(k0MOJ%hn$S;YBdMe@8#Dj-Q2w6fZ!G-9_zre(% zCp~cUY9J;+G~o~6K>Rnndoo6OGwf{U`~AL|?|X0F@7$l<^Rs{7Pl0KcLpr(J!C1&R zrI0d_WfPi8$UP=Qvc#JEng^PyBDeTlo^?S(LAbfRK#^`yIeO^Dcjj|JUt(1ieZh2l(GmV9^a;U1G;u^`rE>Zi zJ!SO|vM(wp=wmt#R&2l-i!#leq`l>Ego;C-uJ+4deA^a}2)M>oS$)#^q^N$;o-N7% wgMyY_7p52zK1h)F|B}}X|Ca}Qnj7+?G&iM+wC{-xF(4zc!x$CgZO86h0L4Q~0{{R3 diff --git a/api-common/target/classes/com/glxp/api/common/enums/ResultEnum.class b/api-common/target/classes/com/glxp/api/common/enums/ResultEnum.class index 0d2a8722e997fe4f957f8ace0338d1415b0791c5..3fd28e70128adf3c916f909216c8a68b68430ec7 100644 GIT binary patch literal 2288 zcma)8>vI!T6#v~ck8N1!wuM>>%EMZc@Q5hLBLy4Nlt$8|X4^mnt=n`7!8|Yz#*cub z;*3>3&>1__ah%Z^#u+V5i!DZ!&;A>dr2XUvzdN3LHIPJ{t+5PSBcg{Wco^zT% z{`uuM07sB-h6znJm}OXCW$2D))9ys-!>exXYSK+F>1@WWXNu{(JEG@{se+%L8EoBA zZ*bJFGVHq$+=#?uhlFMutTOD_#9)c1vKgIWtHT+*qFvM6DJ_$5hsUqz@d9x-V~Y(f zG8D8jYzCX{&=)`sgb38jiYi@4{5y%wugr4(o+71~z@jPu#TF>XT1Tothn01#D zb`e7z_4)j&YR4Yzwc$mcXg5Ra(?sij`LY6y>tBs0p@-b$i}5(cvQuye&&SE&Suc%- zWvn`AfL6CjXBrp&g8}J5$5?*7F zYt!Y*qp8YwbJeL^Tyk8dnkC6ek_>wz-l4UUUfS}?mp7|Z_g8+Ppf^_TOfS#Qa^Yzi zC%LeXR_h%d8KfA2pubfMFvorhdF zEF;K;kyT;DKkWBXtPzG5Ls(fXRet=cGINjfqcS3#f1bfE0{J76a74n}v|;t^|I7QL zjPv|Bt)gY}3{Ho0gB?rt?i2Oi5=>_FP%%BO=SH;g6xH>~b&AZnv4Y`Ek&SDqsFq7| zXLXO}jFu+H%8*{ToShifa`alzbF^S{;c}9Uy_-*=ZiBYjc**7_k{K<<(5xmC8Ld#v zkqbxT+WxQFseclB!ANo2nlZGhqNv0eTJ7ewv#Q=TR2;qWRDFgtIh;|3;|;yV=S}a% zcILE);;GqUF0KzG`7XCSow$eiWav9ghrgM|w%oU!Hz`1tI!IV*3t_3sg{9IJmP%4s zsxV=xa)hO-AWtSf*o39Y1t?wozW}{k(TsQSE*Qq>Z7*5=XD@;M4BKN!_vww{J-S=P zH=6AT7vu-CeAml;g1s{8!W_mY)sH)VTfPnRGMXI63#A?wa}+F z*Z!T0bU*k29j@)>2k4q3)NtAcGd*|FVs>B?4dGUD$OG&qEh(XkWcd?M*T8tfW)Za2 zj7tiTpsSPUJL$SimkCK)-xa)1cb=7-EYHf~T0qCM33Z5gMnaZ)Jcbm~>xjFa6?d*9 zmXJZ#5Hq(p6X5SMOtH2XnwpldyX~b#?3;&6KnKlc4!H$%SU|5@EF3y2pko3$VYPC| zBcM|PdfjH@kXJxH0r@3~LuUjO5YSo0stDa7TsPka_jEzEb(GLgE r>9$kZ^iUg|z!n;tEp#*ra&+RK(&^67*E#y3VX7bCReV4i6LS9oLDepJ literal 2291 zcma)6+jA3T6#s3TWWT0cx=o={C~~osG+Y955pAu+l0qbHYPKy#(7H{R5X=R0VSEG} zZ!@Ai&>1`6IL_z{3x2Mt3(S2&(c z`xB}6&-=~uNk1LZ*^J-H6w`Ts)XEoAg&^@g3L1wZBjZECk&}_=2?Z_T$g$AS_*gI+ z8i^C8egVeBMlu+*2br3b|w^!Q#%bKzKAr zW$rk&+B#hq%v90JE9mxiuiD7bFOzHzCo|SiF+E}BM$Cy6rKL)5kuwTj^8Po&?$svc z31{PGYRt?f*=^OgBV(p1gg$5$&Socv%^V#IR*q74^(HgPLZ5=36@rFp@>uF*4ODGj z_ZYRla5hQa+?~7*op!V)`;g5|CNpMAL4%P@WXwV_N11qQqy4{YHDML(o~`qC*F;~k zqNt=XxHR3h%as0|ujq}Zs+HDzIpf1Mu6S>ISJ&V^+7-8vE#~6ZK$6GS{ABg_@ZM=S z$bau44H;w=bgt%~(a?kQ8jj#S4g2uChW$98BF8W_Rm~UUaVn1$0vdL}t6=NG?EJ#~ z*9-SAm4BQ5^Ow&SXXX}eUMXMwy!_FX#hIx;E?(Bq&5GK>^nCfjRQcQ6m8nlO_!#q) zzqnkPy7l;bGQ0Hn+VtYgjE0?3Qu*qG$J1AB3E3>(`A)+wTT=R_a^us5>-WkZ&XRHE z%8wd$vt+$}sz~{x`T0i=rYhI(RIc6Eu!rT%w!A!7D*y0h`NmBReulMb64mf~8C&z@ z$K{bIaK=;F3^jTAP$LuPtayP2ajXxD(xNWrL)sSoh0)3c6Q9c<=cH1s;}K~7veUd zwo?x^2G~H!Y(yhE(1K0i09(kGEb*!=mN_oh#<*aI4BFyAzYZLwcOR+mr#DD%9R?`B zV>nJ+~!lh8A&%FucVwM%G&5DaaU zP=|yz=`LNGJ}be^65OJzx-{M@!EF+JP8Yf~@08$nz2O0+Twg+y5p$HF8!=}ItwzjM zLYom&OK3M@qJ$13rW3T82w~fZ5V+l#g~Bto7tIGZ@r`Juwdq0=jbsfqs2StXk)w%! WOw+wV(%TR;I(vYF7$TcGME(I0oho_& diff --git a/api-common/target/classes/com/glxp/api/common/req/BaseLimitRequest.class b/api-common/target/classes/com/glxp/api/common/req/BaseLimitRequest.class index 61ab44a76d9714dd1d55176899e63e697a07d843..39622c81b8fee984e802765db57b90fef2eeca68 100644 GIT binary patch literal 1248 zcma)*TTc@~6vzM5+m^DGQluh+fPiinWtH0th6hbdNXjK*`o5H*thU{<-4Z{FFFyLN ziJ~;k7%-4CF$hz^`d5aE*Yv{kG^w^* z*9s$**Y1hyG~8C**=&Wnu7h<+dc(w!WK1_CN;JbJilWK*hld><=BT=9ViY9>qpri< zDBY-4j!Brq7;YOFH*p6O3d7f~RLFX*u)@5U z-=L;g@oR3Q>IR;i`^r>!jF;> zrJ_vRU!XokZV$PNS=L8f&7K1m=?v~U09^kJ{tV+IjR{-?kHrSFW%QEZ4N4)+*bApH zF0Phe1ehS>WR#)Q^XgwOQ1UK?$Mi}o9)yX_jbX}PWtxs<;t=qTYfSm8Omk$K{|l4U z_?&4dVtNwGRJh7y#WF3Ocjz5^Db3hc_8CS#ATQz!x87sWPJPAX8D_*X-?Pj|7Sk@| zB9mqJy;BF`L*o(krzptVl2NzDd6UdRkrf@s5_QX1<+p{kOJv*q`Y+QrgH+KN&XQ_{ Irvz4i0YcK!6951J literal 1248 zcma))TTj$b5Xb*#x4UIa5m;p9rhTNY5UDe?ug7-yilKdPyDtnOU38V*3CyaF_F}?OXCal*Bv?12kB-tMtN$=OO9GiLZ^Y`(QDGSU;RjIYV!t>O-7% zoiZN>^BARVcN0*;4SGsuL;2_BkI205xjdG7nPVi8T;8P4Q0Lvnb7X#%w&Lg%a-6o5 zFLkq$@`5IPDNOM!r|1Y17n8!2?PZ!yW#U3v;|f!@muZen^M7HI8DBCD#!Rc^!s{D=-=6qVkD!Tzh~2?P~@j;(`+*j3nd+86AM^msPqHR9=ab#HXk`Q1zzCWp*XT%^09a? zjwWJEv>Ii00|sllb5hU1H7x76ZsG=3F0|VDG?v0+DE22|D15o+cw)zKU1uD1y=~wY zR(0GqaR+zLx{jn? zU?3RgTaGVwCtgp4d%WjT#%cw9?sj?Ts5nk$B%T`zNpn)u$&F|3LM?$2 zPrlwIx*Z`8g26i;a!*JR(ncl;sL{myv*SH)m1;;iQBz8)M@=eiqZ3TRzIfxP)(VO9 z+fdhqhHTNT1U)Hr^pQu?qqhb+VPwhPr>KoIdBAexJ6Pis`ZruXL6N+rQ`|g3}*mIh5!olu@UQITb(y>l86OKp_^l>8-@I##aTd&GKMgC9!eSI>V+EzI`em@GN@El#rbl>8R>>xrDt|MrUdr?Y dPcLIijAqJIA*Qu|Fsa$kn5q%eCfO98{Q*z`(C`2N literal 1096 zcma))+iuf95QhKF$%!$|u_=W@fwYjMP;b z+6LAbvY|NK4j3w(1AfG9m-{2TCqu^{J!L3J#}hrty)i>6kKmG`PnWEL>!0{6|mdlGBNG`v+nm8Rm2-l8$Td?!JCWR3Z0=fj4#H;^G9=SQ$)P zct)`IVIqacP##2KD12T1mgBl=WHjx~-&g7PqI$q!9C0@i-FFPt=4Nt2x<&L3^Yki# z6n#{=-chl%WkNFO6ZyX*;a$1pzWqh+!cWXP7uR!E?V zOQ_Kf)I%*mks5gn^Qh0nZCcg8Z2L1ZA8C`K<3LUa7ZQiF@!Um6w)=Zfi#I*7c QCe{0x$M$fmIT3m=)zEC2ui diff --git a/api-common/target/classes/com/glxp/api/common/res/BaseResponse.class b/api-common/target/classes/com/glxp/api/common/res/BaseResponse.class index 68d9f9d4728229830689baa432d3a084f0fd8bd1..af05693a3d57d4e4393c6ea5f1a7fba7eaad537a 100644 GIT binary patch literal 2915 zcma)8ZBrXn6n<{9Z=_2bUfU=t)mRe}8m;&iUZk|NqCgP>+FG?sSVL+^VzOxc5&Z-H z0Q;pM>WtDEopJO_o$)tW>vQ++h7B-IW?=W+d!PHgT)g_={Z6mD$ab<3WBF;lHqy*Yt+CcD)K3w{lJK;RGe`=Udv3e!REQjm zAUC{LwO;XogEodROuik*bGlK=+vx=9Ms1wMIRUHe)EB?mcWMG7nFwJ3&EAsW=WINW zF`ivsQ;3QNrAJ6GAi$SpQhwEvs|satNVM~ZmZ;M*Zit! zl%3j^)2hmGFsXUF)waNet+oGUS z5H_yt$b>%^3~Ya)(}VqLtut2pRObcz)F9iNFcVUi{teG5f4$-~gY4*Q>q{$(ba08@ z^5WR9@y5{uhpcqxa6PTg%FL9Cktz#fojX3o*ftvbt+IQqDobM^+7K6I|KL0uGR8|V z&L=N3S}}PI`ETAb5V-8y3tXj7F!;Q}nag|&zV(U65I@m~<0_wW8R)|zpSA+v8m@En zLD$R@M?&5?e0J0Q4D%5eqjYwUbi9L3pzA+Mce+P9UQ!g}sCNTL>5@IsDHT7Ye;;8v zpp|c_y)lvd1?I^jjw(bTq7+zWNkrr{xF+RX;lD1poaFKg0UNlm=#28O7 z_yGMWJ!M2d>7q$cx@e_L39w{CH853n?vFv1BUM zQo5-7OU$Cb$x7+|(%8v~nNtS_KF6_+&+!G_(XoavX~mFW=yw=LoY%`GIJ7j(QJ8I7 zdL*{ZKzb?ocQBq2qET=mC^Ce2MuNj}OiqkI4*?-Y>z)c=Mg(?6w_Nl}p9;h}Oskxcof`|< Kw2U2p>6!%7Bqm$MAHg5+ z2gnyb=!}*bopJOF&iI=|e9qoYvMEtB)7*RRxzC>aoadZ-`{&<3{|ev?DoKpudIAPk zWmuD8-NKC|=M5P?6u?Jf-IU>$EI+nzI|&EZZG0m0r!stI zuQaw++?KoT`Cf~nB>7dB!f5ovkb!(Bp%sTdL`XppW|kZR!~1f_tugRGAAPBl>Yomxx|SD>7fXJpNHOJ6Lz&7ezoCxVu? zOK$zLq@cmBxb2E6AiHjnv{zOamoGB~+9vyEr{>ccQnn|$^o$9`#`YUZL=D;5^p%jx>%95#!jo`U8zbxAB?uJQDht(!*d!);{RLQ!6m%y;8kQD zyd~Boat`vCa&Q?}G#u$&W5s)6r&`;RLZzcLvQn@)2Od6`p-jqC<6-i1Y?i5UNuQQB z>0lW-_FXTq%AESS&8Ao98!|np=OViFF=5&I@SP6)S3F+iqc+N?FpijLMk^+=1v8a{ zhU0;K0{duFT8`uNT;Qy6Hgb=k{XiqmP=FaY6L^WXqX2jr6I{L0=Q+uhCQ5T0r`-$p zBVymv5e?@I8II)|5H7wq-2NfMvG5dQFFSp2xYSVLl#0{jcM63t>=Ne~b2W4MpAZ`? z;+R5&B8tFLB`qSS$vu(tHU11f&PZ|lb(|h_NPO5sqy_%tkfXsNZ}1;zJP>Fjnu$K_ zA*#QmF?v}_CX(eboFIWPr(--$3HTn)=Pyc~^8T~O1K7ccw(RX2Y5Q(BeNTO(F48fR>k$!-YjFB-Tpk&b^ zC|R^KmVoRKWM%9QNPkE|`ZJf|wj$cC<9(bBZr3R8;T$hWjK3<1^u^i5CCt#$@h+}l zmX^VH;ymVPnW!=LJS__?j_>ei2i>4FydQRhihG`MFOW|jj%ELa{T3FUV9dfr{@L0S z993o_YIa0FOVM?C5tZ2ZfYM918lti!8NH(F#w!X&H%Wu3$rJMI-46?UF6bjZt^|$q zMG(FwL*Gcv%<6MN*^Z}XDlD3v%0GZLy^DQ!#GfeYvXRll9a~DNwvt67*kTofkL-*Q zY#kq5n0a+z$T^NxivAwy7+Ap~tr(I_{e9*UC+0M5Da<@C;Swz)lG}|?dJ+6|4>4PG)Q>>2yVxiy*ke55-V_`}|w1hM!ZQT-ofvNKs z+?tpeYa@w!^#`zVBJ##ADRQ4MCZU8@~5oAQ=WIEOLktugJEPAHtm1?Q`g$(cxMh`RjkR{f~B zS#3Vwt-i1@DLffWnaC=PV%ixt?9TUc#KH__P2?2vuw7Ln&O1Hg#QYgz&tOjB5{gdA zpXD`!D+*U}?T!AVv;WiyYQH`_*4MQ-(tOf63m^bZhQNQxY53z0=e-=Du)wq83s|v; z>x?0h!p;)UZAQUJp1^$c385W3x|iy~>LOytM!JaG`7Xxo_bl;Y-udC5I2OQozX?mY z!CMdsl(9^b72brbpQ-S)%8XxQVV`%6Dd8;>Kr{`VV3NG4?R*buVbLMtWw$_zIO%@| zf;6y%n*tb;d9Xx~UNahuY0trKfr=vqo7z3>y}}$l6#jbn7)ZJv^8Gg4!fmz_0C#Yg zqJkK6-RKzS*2zfc17Gr1A*CxrXEWH=SG4XaT3{4!ib5{(EA()AU`@7k4B`$Jqp*QZ sHh8nz@bK<=cq@!Dj*#Hl|AB$}2RjLQSR$$K$5Se(qEy2c2T8!~Kfrir&j0`b delta 847 zcmZWn+fEZv6kRjZ>0CV6s}(`*g@Vv278OARinl7t#rR_6NlQbtgfu2?edQBOogXnV z)7}ad87T zCA(!~RN}lWw=FEVaHJf=qKi9NlI5;!mo2PVSk(|+X||f3ss>|v=B3})cP*>kZ8Y}U z{wJ;KXN*7o8-3?XDpJ#Ig#?lsihfTo)+|&N)^JbZJ{~AM#3O|o9&1SK*FV%N-A?nM zvR-e$+p51;7{w(EPZZYiRN)ym6edvAFh!)aZy3pxhWJU_LA~|1@_cuHuhHps7kmAQ z-tS32s}&5PeGw`85xwBg>BS84G!f@0fG9|cB-fPRGBdBz;TfQCfw^J@FpfviNd*Y!Kv|$ocY$pJ&VVa_B4oBSR zWV3{k&WFCFmSru+4o7D**cK?72^B3ciZ?|e@{J5|erQeJ>JV5u^Cc52!DB;?A7@o! q5QpUuZ>OUBdAm=sG?NEEC)%z>;C`}Dq({F diff --git a/api-common/target/test-classes/com/glxp/api/common/util/ResultVOUtilsTest.class b/api-common/target/test-classes/com/glxp/api/common/util/ResultVOUtilsTest.class index 032c8eebc33481bc268977f38198012054a81823..9f4eb69e77b809465ecb052ffc0c7f07130cd9ce 100644 GIT binary patch delta 213 zcmeBV?qs$(^>5cc1_lNb20<$cIDHN21bx>Ajt{j=>us-AkC_^oq=&9 ySegq+f}|N3SQxm0Bo9OZkmd#Q7#aBBnzg}vpcuMFb|j6AAdL{6{6O_g3<3ZUwiOuw delta 212 zcmeBV?qpUu^>5cc1_lNb20<2lz=A9c96&Y?L;(XQ0~e6T$iNNPtPSP^#n3d$F|Z@)WQ6PF0jg(W-~|B2Dip~8 diff --git a/scripts/vue-admin.sql b/scripts/vue-admin.sql deleted file mode 100644 index a26086b1..00000000 --- a/scripts/vue-admin.sql +++ /dev/null @@ -1,234 +0,0 @@ -/* -Navicat MySQL Data Transfer - -Source Server : php -Source Server Version : 50553 -Source Host : localhost:3306 -Source Database : vue-admin - -Target Server Type : MYSQL -Target Server Version : 50553 -File Encoding : 65001 - -Date: 2018-11-20 18:59:57 -*/ - -SET FOREIGN_KEY_CHECKS=0; - --- ---------------------------- --- Table structure for ad --- ---------------------------- -DROP TABLE IF EXISTS `ad`; -CREATE TABLE `ad` ( - `ad_id` int(11) NOT NULL AUTO_INCREMENT COMMENT '广告ID', - `title` varchar(255) NOT NULL COMMENT '广告标题', - `describe` varchar(255) NOT NULL DEFAULT '' COMMENT '描述', - `pic` varchar(255) NOT NULL DEFAULT '' COMMENT '图片的地址', - `jump_type` tinyint(4) unsigned NOT NULL DEFAULT '0' COMMENT '跳转方式（0，web 页面，1：APP内链接，2：小程序）', - `jump_url` varchar(255) NOT NULL DEFAULT '' COMMENT '跳转的url路径', - `ios_url` varchar(255) NOT NULL DEFAULT '' COMMENT 'ios 的类名', - `android_url` varchar(255) NOT NULL DEFAULT '' COMMENT 'android 的类名', - `wxa_appid` varchar(50) NOT NULL DEFAULT '' COMMENT '微信小程序的APPID（跳转类型为 1 时有效）', - `channel_type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '渠道名单类型（0：不做处理，1：白名单，2：黑名单）', - `channel_list` varchar(255) NOT NULL DEFAULT '' COMMENT '渠道黑名单', - `android_version_type` tinyint(4) unsigned NOT NULL DEFAULT '0' COMMENT 'android 版本名单类型（0：不做处理，1：白名单，2：黑名单）', - `android_version_list` varchar(255) NOT NULL DEFAULT '' COMMENT 'android 版本黑名单', - `ios_version_type` tinyint(4) unsigned NOT NULL DEFAULT '0' COMMENT 'ios 版本名单类型（0：不做处理，1：白名单，2：黑名单）', - `ios_version_list` varchar(255) NOT NULL DEFAULT '' COMMENT 'ios 版本黑名单', - `new_show_start_num` int(11) NOT NULL DEFAULT '0' COMMENT '新用户从第几次开始展示', - `new_show_max_num` int(11) NOT NULL DEFAULT '0' COMMENT '新用户最大展示几次', - `old_show_start_num` int(11) NOT NULL DEFAULT '0' COMMENT '老用户第几次开始展示', - `old_show_max_num` int(11) NOT NULL DEFAULT '0' COMMENT '老用户最大展示几次', - `start_time` datetime DEFAULT NULL COMMENT '开始时间', - `end_time` datetime DEFAULT NULL COMMENT '结束时间', - `event_name` varchar(255) NOT NULL DEFAULT '' COMMENT '统计事件名称', - `status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '广告状态（0：禁用，1：正常）', - `create_time` datetime NOT NULL COMMENT '创建时间', - `modified_time` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`ad_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='广告表'; - --- ---------------------------- --- Table structure for ad_site --- ---------------------------- -DROP TABLE IF EXISTS `ad_site`; -CREATE TABLE `ad_site` ( - `site_id` int(11) NOT NULL AUTO_INCREMENT COMMENT '广告位id', - `site_name` varchar(255) NOT NULL COMMENT '广告位名称', - `describe` varchar(255) NOT NULL DEFAULT '' COMMENT '广告位描述', - `ad_ids` varchar(255) NOT NULL DEFAULT '' COMMENT '广告位的广告id（用 , 隔开）', - `create_time` datetime NOT NULL COMMENT '创建时间', - `modified_time` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`site_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='广告位'; - --- ---------------------------- --- Table structure for auth_admin --- ---------------------------- -DROP TABLE IF EXISTS `auth_admin`; -CREATE TABLE `auth_admin` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `username` varchar(60) NOT NULL DEFAULT '' COMMENT '用户名', - `password` varchar(64) NOT NULL DEFAULT '' COMMENT '登录密码；sp_password加密', - `tel` varchar(50) NOT NULL DEFAULT '' COMMENT '用户手机号', - `email` varchar(100) NOT NULL DEFAULT '' COMMENT '登录邮箱', - `avatar` varchar(255) NOT NULL DEFAULT '' COMMENT '用户头像', - `sex` smallint(1) NOT NULL DEFAULT '0' COMMENT '性别；0：保密，1：男；2：女', - `last_login_ip` varchar(16) NOT NULL DEFAULT '' COMMENT '最后登录ip', - `last_login_time` datetime NOT NULL COMMENT '最后登录时间', - `create_time` datetime NOT NULL COMMENT '注册时间', - `status` int(11) NOT NULL DEFAULT '1' COMMENT '用户状态 0：禁用； 1：正常 ；2：未验证', - PRIMARY KEY (`id`), - KEY `user_login_key` (`username`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COMMENT='管理员表'; - --- ---------------------------- --- Records of auth_admin --- ---------------------------- -INSERT INTO `auth_admin` VALUES ('1', 'admin', 'c3284d0f94606de1fd2af172aba15bf3', 'admin', 'lmxdawn@gmail.com', 'sssss', '0', '127.0.0.1', '2018-07-06 17:19:00', '2018-07-06 17:19:00', '1'); - --- ---------------------------- --- Table structure for auth_permission --- ---------------------------- -DROP TABLE IF EXISTS `auth_permission`; -CREATE TABLE `auth_permission` ( - `role_id` int(11) unsigned NOT NULL COMMENT '角色', - `permission_rule_id` int(11) NOT NULL DEFAULT '0' COMMENT '权限id', - `type` varchar(30) DEFAULT NULL COMMENT '权限规则分类，请加应用前缀,如admin_' -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='权限授权表'; - --- ---------------------------- --- Records of auth_permission --- ---------------------------- -INSERT INTO `auth_permission` VALUES ('1', '4', 'admin'); -INSERT INTO `auth_permission` VALUES ('1', '3', 'admin'); -INSERT INTO `auth_permission` VALUES ('1', '2', 'admin'); -INSERT INTO `auth_permission` VALUES ('1', '1', 'admin'); - --- ---------------------------- --- Table structure for auth_permission_rule --- ---------------------------- -DROP TABLE IF EXISTS `auth_permission_rule`; -CREATE TABLE `auth_permission_rule` ( - `id` int(8) unsigned NOT NULL AUTO_INCREMENT COMMENT '规则编号', - `pid` int(11) NOT NULL DEFAULT '0' COMMENT '父级id', - `name` char(80) NOT NULL DEFAULT '' COMMENT '规则唯一标识', - `title` char(20) NOT NULL DEFAULT '' COMMENT '规则中文名称', - `status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态：为1正常，为0禁用', - `condition` char(100) NOT NULL DEFAULT '' COMMENT '规则表达式，为空表示存在就验证，不为空表示按照条件验证', - `listorder` int(10) NOT NULL DEFAULT '0' COMMENT '排序，优先级，越小优先级越高', - `create_time` datetime NOT NULL COMMENT '创建时间', - `update_time` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`id`), - UNIQUE KEY `name` (`name`) -) ENGINE=InnoDB AUTO_INCREMENT=26 DEFAULT CHARSET=utf8 COMMENT='规则表'; - --- ---------------------------- --- Records of auth_permission_rule --- ---------------------------- -INSERT INTO `auth_permission_rule` VALUES ('1', '0', 'user_manage', '用户管理', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); -INSERT INTO `auth_permission_rule` VALUES ('2', '1', 'user_manage/admin_manage', '管理组', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); -INSERT INTO `auth_permission_rule` VALUES ('3', '2', 'admin/auth_admin/index', '管理员管理', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); -INSERT INTO `auth_permission_rule` VALUES ('4', '3', 'admin/auth_admin/save', '添加管理员', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); -INSERT INTO `auth_permission_rule` VALUES ('5', '3', 'admin/auth_admin/edit', '编辑管理员', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); -INSERT INTO `auth_permission_rule` VALUES ('6', '3', 'admin/auth_admin/delete', '删除管理员', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); -INSERT INTO `auth_permission_rule` VALUES ('7', '2', 'admin/auth_role/index', '角色管理', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); -INSERT INTO `auth_permission_rule` VALUES ('8', '7', 'admin/auth_role/save', '添加角色', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); -INSERT INTO `auth_permission_rule` VALUES ('9', '7', 'admin/auth_role/edit', '编辑角色', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); -INSERT INTO `auth_permission_rule` VALUES ('10', '7', 'admin/auth_role/delete', '删除角色', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); -INSERT INTO `auth_permission_rule` VALUES ('11', '7', 'admin/auth_role/auth', '角色授权', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); -INSERT INTO `auth_permission_rule` VALUES ('12', '2', 'admin/auth_permission_rule/index', '权限管理', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); -INSERT INTO `auth_permission_rule` VALUES ('13', '12', 'admin/auth_permission_rule/save', '添加权限', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); -INSERT INTO `auth_permission_rule` VALUES ('14', '12', 'admin/auth_permission_rule/edit', '编辑权限', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); -INSERT INTO `auth_permission_rule` VALUES ('15', '12', 'admin/auth_permission_rule/delete', '删除权限', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); -INSERT INTO `auth_permission_rule` VALUES ('16', '0', 'ad_manage', '广告相关', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); -INSERT INTO `auth_permission_rule` VALUES ('17', '16', 'admin/ad_site/index', '广告位管理', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); -INSERT INTO `auth_permission_rule` VALUES ('18', '17', 'admin/ad_site/save', '广告位添加', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); -INSERT INTO `auth_permission_rule` VALUES ('19', '17', 'admin/ad_site/edit', '广告位编辑', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); -INSERT INTO `auth_permission_rule` VALUES ('20', '17', 'admin/ad_site/delete', '广告位删除', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); -INSERT INTO `auth_permission_rule` VALUES ('21', '16', 'admin/ad/index', '广告管理', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); -INSERT INTO `auth_permission_rule` VALUES ('22', '21', 'admin/ad/save', '广告添加', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); -INSERT INTO `auth_permission_rule` VALUES ('23', '21', 'admin/ad/edit', '广告编辑', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); -INSERT INTO `auth_permission_rule` VALUES ('24', '21', 'admin/ad/delete', '广告删除', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); -INSERT INTO `auth_permission_rule` VALUES ('25', '17', 'admin/ad_site/adlist', '广告位选择时的广告列表', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); - --- ---------------------------- --- Table structure for auth_role --- ---------------------------- -DROP TABLE IF EXISTS `auth_role`; -CREATE TABLE `auth_role` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `name` varchar(20) NOT NULL COMMENT '角色名称', - `pid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '父角色ID', - `status` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '状态', - `remark` varchar(255) NOT NULL DEFAULT '' COMMENT '备注', - `create_time` datetime NOT NULL COMMENT '创建时间', - `update_time` datetime NOT NULL COMMENT '更新时间', - `listorder` int(3) NOT NULL DEFAULT '0' COMMENT '排序，优先级，越小优先级越高', - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COMMENT='角色表'; - --- ---------------------------- --- Records of auth_role --- ---------------------------- -INSERT INTO `auth_role` VALUES ('1', '超级管理员', '0', '1', '拥有网站最高管理员权限！', '2018-07-06 17:19:00', '2018-07-06 17:19:00', '0'); - --- ---------------------------- --- Table structure for auth_role_admin --- ---------------------------- -DROP TABLE IF EXISTS `auth_role_admin`; -CREATE TABLE `auth_role_admin` ( - `role_id` int(11) unsigned DEFAULT '0' COMMENT '角色 id', - `admin_id` int(11) DEFAULT '0' COMMENT '管理员id' -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户角色对应表'; - --- ---------------------------- --- Records of auth_role_admin --- ---------------------------- - --- ---------------------------- --- Table structure for file_resource --- ---------------------------- -DROP TABLE IF EXISTS `file_resource`; -CREATE TABLE `file_resource` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '资源id', - `tag_id` int(11) NOT NULL DEFAULT '0' COMMENT '资源分组id', - `type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '资源的类型（0：图片）', - `filename` varchar(255) NOT NULL DEFAULT '' COMMENT '资源的原名', - `path` varchar(255) NOT NULL DEFAULT '' COMMENT '资源的路径（不加 域名的地址）', - `size` int(11) NOT NULL DEFAULT '0' COMMENT '大小', - `ext` varchar(10) NOT NULL DEFAULT '' COMMENT '资源的文件后缀', - `create_time` datetime NOT NULL COMMENT '创建时间', - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8 COMMENT='资源表'; - --- ---------------------------- --- Records of file_resource --- ---------------------------- -INSERT INTO `file_resource` VALUES ('1', '1', '0', 'Group 5.png', 'resources/image/20180530/854ae62758c585be5128cf344a511242.png', '7539', 'png', '2018-05-30 20:41:54'); -INSERT INTO `file_resource` VALUES ('2', '0', '0', '643353_sdfaf123.png', 'resources/image/20180823/c356ca140f631a512f1c3a5e37a15dc1.png', '11507', 'png', '2018-08-23 13:38:42'); -INSERT INTO `file_resource` VALUES ('3', '0', '0', '643353_sdfaf123.png', 'resources/image/20180823/4549c39e9c07c35681ee9fa94e0fc07e.png', '11507', 'png', '2018-08-23 14:05:18'); -INSERT INTO `file_resource` VALUES ('4', '0', '0', '', '', '0', '', '2018-08-23 15:45:21'); -INSERT INTO `file_resource` VALUES ('5', '0', '0', '', '', '2000000', '', '2018-08-23 15:45:21'); -INSERT INTO `file_resource` VALUES ('6', '0', '0', '', '', '0', '', '2018-08-23 15:45:21'); -INSERT INTO `file_resource` VALUES ('7', '0', '0', '', '', '0', '', '2018-08-23 15:45:21'); -INSERT INTO `file_resource` VALUES ('8', '0', '0', '643353_sdfaf123.png', 'resources/image/20180823/0c424412b231eb8cb969377e15dbb812.png', '11507', 'png', '2018-08-23 15:53:32'); -INSERT INTO `file_resource` VALUES ('9', '0', '0', '232826334630444283.png', 'FjBRVPOPF9gLeNBCAvK7jbif4yg8', '9668', 'png', '2018-08-23 16:08:13'); -INSERT INTO `file_resource` VALUES ('10', '0', '0', '232826334630444283.png', 'FjBRVPOPF9gLeNBCAvK7jbif4yg8', '9668', 'png', '2018-08-23 16:09:07'); -INSERT INTO `file_resource` VALUES ('11', '0', '0', '643353_sdfaf123.png', 'resources/image/20180823/52af5f8556a3af84cee696972b61baf4.png', '11507', 'png', '2018-08-23 17:06:05'); - --- ---------------------------- --- Table structure for file_resource_tag --- ---------------------------- -DROP TABLE IF EXISTS `file_resource_tag`; -CREATE TABLE `file_resource_tag` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '资源分组的id', - `tag` varchar(255) NOT NULL DEFAULT '' COMMENT '资源分组的tag', - `create_time` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COMMENT='资源的分组表'; - --- ---------------------------- --- Records of file_resource_tag --- ---------------------------- -INSERT INTO `file_resource_tag` VALUES ('1', '测试', '2018-05-30 20:41:48');