From 03fceaf8d919afcf4a273fb555d28bf3b0062af8 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 23 Jun 2021 09:11:23 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=8F=90=E4=BA=A4=E5=9B=BD=E5=AE=B6=E5=BA=93?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=94=99=E8=AF=AF=EF=BC=9B2.=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E5=87=BA=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/auth/LoginController.java | 24 +- .../controller/auth/RegisterController.java | 23 +- .../controller/info/SetupController.java | 38 + .../inout/CodeContrastController.java | 183 --- .../controller/inout/DruginfoController.java | 231 --- .../admin/controller/inout/InoutUtils.java | 312 ++++ .../inout/MyErpOrderController.java | 79 + .../controller/inout/OrderController.java | 237 ++- .../controller/inout/UdiDlHttpClient.java | 57 + .../controller/inout/UdiInfoController.java | 115 ++ .../inout/UdiRelevanceController.java | 168 ++ .../controller/inout/UdiTraceController.java | 149 ++ .../controller/inout/UnitController.java | 75 - .../inout/UnitMaintainController.java | 138 ++ .../controller/inout/WareHouseController.java | 447 +----- .../controller/inout/WhitecodeController.java | 63 - .../publish/PostIdentifyController.java | 12 +- .../publish/SubUdiProductController.java | 4 +- .../publish/UdiDeviceIdController.java | 14 +- .../receipts/BussinessTypeController.java | 97 -- .../receipts/ManuOrderController.java | 134 -- .../receipts/MipsBarcodeController.java | 43 - .../receipts/ProductController.java | 248 --- .../receipts/ProductInfoController.java | 373 ----- .../receipts/ReceiptsController.java | 192 --- .../receipts/UnitMaintainController.java | 91 -- .../udi/admin/dao/info/IdentifierDao.java | 3 + .../com/glxp/udi/admin/dao/info/SetupDao.java | 16 + .../udi/admin/dao/inout/MyErpOrderDao.java | 43 + .../glxp/udi/admin/dao/inout/OrderDao.java | 10 + .../glxp/udi/admin/dao/inout/UdiInfoDao.java | 37 + .../udi/admin/dao/inout/UdiRelevanceDao.java | 34 + .../{receipt => inout}/UnitMaintainDao.java | 8 +- .../udi/admin/dao/inout/WarehouseDao.java | 8 +- .../admin/dao/inout/WarehousetempMapper.java | 40 + .../admin/dao/receipt/BussinessTypeDao.java | 22 - .../udi/admin/dao/receipt/MipsBarcodeDao.java | 15 + .../udi/admin/dao/receipt/ProductDao.java | 7 +- .../udi/admin/dao/receipt/ProductInfoDao.java | 17 + .../admin/dao/receipt/ReceiptsdDetailDao.java | 2 +- .../udi/admin/entity/info/SetupEntity.java | 27 + .../entity/inout/BussinessTypeEntity.java | 14 + .../entity/inout/ErpDetailCodeEntity.java | 21 + .../admin/entity/inout/ErpOrderEntity.java | 55 + .../admin/entity/inout/OrderDetailEntity.java | 34 + .../udi/admin/entity/inout/OrderEntity.java | 6 + .../admin/entity/inout/TraceUploadEntity.java | 132 ++ .../udi/admin/entity/inout/UdiInfoEntity.java | 342 ++++ .../entity/inout/UdiRelevanceEntity.java | 17 + .../UnitMaintainEntity.java | 4 +- .../admin/entity/inout/WarehouseEntity.java | 11 +- .../udi/admin/entity/inout/Warehousetemp.java | 201 +++ .../entity/inout/WarehousetempEntity.java | 1 + .../entity/inout/WarehousetempExample.java | 1429 +++++++++++++++++ .../receipt/ProductOrderDetailEntity.java | 35 + .../entity/receipt/StockDetailEntity.java | 33 + .../admin/req/info/FilterSetupRequest.java | 12 + .../req/inout/FilterErpOrderRequest.java | 23 + .../admin/req/inout/FilterUdiInfoRequest.java | 17 + .../req/inout/FilterWarehouseRequest.java | 10 + .../admin/req/inout/OrderFilterRequest.java | 8 + .../admin/req/inout/PostErpOrderRequest.java | 14 + .../udi/admin/req/inout/PostOrderRequest.java | 69 + .../UnitMaintainFilterRequest.java | 3 +- .../req/inout/WarehouseQueryRequest.java | 1 + .../admin/req/receipt/FilterBatchnoCount.java | 10 + .../admin/req/receipt/FilterStockRequest.java | 13 + .../udi/admin/res/auth/LoginResponse.java | 14 + .../admin/res/auth/LoginUserInfoResponse.java | 2 +- .../admin/res/inout/UdiRelevanceResponse.java | 40 + .../udi/admin/res/inout/UdiTraceResponse.java | 20 + .../admin/res/inout/WarehouseResponse.java | 1 + .../admin/service/auth/AuthLoginService.java | 2 +- .../auth/impl/AuthLoginServiceImpl.java | 35 + .../admin/service/info/IdentifierService.java | 7 + .../udi/admin/service/info/SetupService.java | 16 + .../info/impl/IdentifierServiceImpl.java | 32 + .../service/info/impl/SetupServiceImpl.java | 39 + .../BussinessTypeService.java | 3 +- .../service/inout/MyErpOrderService.java | 40 + .../udi/admin/service/inout/OrderService.java | 14 + .../admin/service/inout/UdiInfoService.java | 37 + .../service/inout/UdiRelevanceService.java | 31 + .../UnitMaintainService.java | 9 +- .../admin/service/inout/WarehouseService.java | 15 +- .../inout/impl/MyErpOrderServiceImpl.java | 123 ++ .../service/inout/impl/OrderServiceImpl.java | 38 + .../inout/impl/UdiInfoServiceImpl.java | 102 ++ .../inout/impl/UdiRelevanceServiceImpl.java | 84 + .../impl/UnitMaintainServiceImpl.java | 15 +- .../inout/impl/WareHouseServiceImpl.java | 46 +- .../service/receipts/ManuorderService.java | 3 +- .../service/receipts/MipsBarcodeService.java | 19 + .../service/receipts/ProductInfoService.java | 20 +- .../service/receipts/ProductService.java | 9 +- .../receipts/ReceiptDetailService.java | 1 + .../service/receipts/ReceiptsService.java | 1 + .../impl/BussinessTypeServiceImpl.java | 44 - .../receipts/impl/MipsBarcodeServiceImpl.java | 47 + .../receipts/impl/ProductInfoServiceImpl.java | 60 +- .../receipts/impl/ProductServiceImpl.java | 15 +- .../udi/admin/thread/TaskExecutorConfig.java | 4 +- .../udi/admin/thread/TransInoutService.java | 241 +++ .../com/glxp/udi/admin/util/DateUtil.java | 9 + .../glxp/udi/admin/util/FilterUdiUtils.java | 140 +- .../glxp/udi/admin/util/GetAuthAdminUtil.java | 24 + .../com/glxp/udi/admin/util/HttpClient.java | 34 +- .../glxp/udi/admin/util/ReceiptBeanUtils.java | 39 - .../udi/admin/util/WarehousBeanUtils.java | 104 +- .../main/resources/application-pro.properties | 5 +- .../src/main/resources/logback-spring.xml | 145 ++ .../mapper/auth/AuthPermissionRuleDao.xml | 2 +- .../mybatis/mapper/info/IdentifierDao.xml | 5 + .../mybatis/mapper/inout/MyErpOrderDao.xml | 181 +++ .../mybatis/mapper/inout/OrderDao.xml | 128 +- .../mybatis/mapper/inout/SetupDao.xml | 57 + .../mybatis/mapper/inout/UdiInfoDao.xml | 201 +++ .../mybatis/mapper/inout/UdiRelevanceDao.xml | 141 ++ .../mybatis/mapper/inout/UnitMaintainDao.xml | 62 + .../mybatis/mapper/inout/WarehouseDao.xml | 52 +- .../mybatis/mapper/inout/WarehousetempDao.xml | 11 +- .../mapper/inout/WarehousetempMapper.xml | 485 ++++++ .../mapper/receipt/UnitMaintainDao.xml | 39 - 123 files changed, 7011 insertions(+), 2433 deletions(-) create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/controller/info/SetupController.java delete mode 100644 api-udims/src/main/java/com/glxp/udi/admin/controller/inout/CodeContrastController.java delete mode 100644 api-udims/src/main/java/com/glxp/udi/admin/controller/inout/DruginfoController.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/controller/inout/InoutUtils.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/controller/inout/MyErpOrderController.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/controller/inout/UdiDlHttpClient.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/controller/inout/UdiInfoController.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/controller/inout/UdiRelevanceController.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/controller/inout/UdiTraceController.java delete mode 100644 api-udims/src/main/java/com/glxp/udi/admin/controller/inout/UnitController.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/controller/inout/UnitMaintainController.java delete mode 100644 api-udims/src/main/java/com/glxp/udi/admin/controller/inout/WhitecodeController.java delete mode 100644 api-udims/src/main/java/com/glxp/udi/admin/controller/receipts/BussinessTypeController.java delete mode 100644 api-udims/src/main/java/com/glxp/udi/admin/controller/receipts/ManuOrderController.java delete mode 100644 api-udims/src/main/java/com/glxp/udi/admin/controller/receipts/MipsBarcodeController.java delete mode 100644 api-udims/src/main/java/com/glxp/udi/admin/controller/receipts/ProductController.java delete mode 100644 api-udims/src/main/java/com/glxp/udi/admin/controller/receipts/ProductInfoController.java delete mode 100644 api-udims/src/main/java/com/glxp/udi/admin/controller/receipts/ReceiptsController.java delete mode 100644 api-udims/src/main/java/com/glxp/udi/admin/controller/receipts/UnitMaintainController.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/dao/info/SetupDao.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/dao/inout/MyErpOrderDao.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/dao/inout/UdiInfoDao.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/dao/inout/UdiRelevanceDao.java rename api-udims/src/main/java/com/glxp/udi/admin/dao/{receipt => inout}/UnitMaintainDao.java (66%) create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/dao/inout/WarehousetempMapper.java delete mode 100644 api-udims/src/main/java/com/glxp/udi/admin/dao/receipt/BussinessTypeDao.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/entity/info/SetupEntity.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/entity/inout/BussinessTypeEntity.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/entity/inout/ErpDetailCodeEntity.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/entity/inout/ErpOrderEntity.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/entity/inout/OrderDetailEntity.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/entity/inout/TraceUploadEntity.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/entity/inout/UdiInfoEntity.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/entity/inout/UdiRelevanceEntity.java rename api-udims/src/main/java/com/glxp/udi/admin/entity/{receipt => inout}/UnitMaintainEntity.java (72%) create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/entity/inout/Warehousetemp.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/entity/inout/WarehousetempExample.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/entity/receipt/ProductOrderDetailEntity.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/entity/receipt/StockDetailEntity.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/req/info/FilterSetupRequest.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/req/inout/FilterErpOrderRequest.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/req/inout/FilterUdiInfoRequest.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/req/inout/FilterWarehouseRequest.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/req/inout/PostErpOrderRequest.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/req/inout/PostOrderRequest.java rename api-udims/src/main/java/com/glxp/udi/admin/req/{receipt => inout}/UnitMaintainFilterRequest.java (70%) create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/req/receipt/FilterBatchnoCount.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/req/receipt/FilterStockRequest.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/res/auth/LoginResponse.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/res/inout/UdiRelevanceResponse.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/res/inout/UdiTraceResponse.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/service/info/SetupService.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/service/info/impl/SetupServiceImpl.java rename api-udims/src/main/java/com/glxp/udi/admin/service/{receipts => inout}/BussinessTypeService.java (91%) create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/service/inout/MyErpOrderService.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/service/inout/UdiInfoService.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/service/inout/UdiRelevanceService.java rename api-udims/src/main/java/com/glxp/udi/admin/service/{receipts => inout}/UnitMaintainService.java (58%) create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/service/inout/impl/MyErpOrderServiceImpl.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/service/inout/impl/UdiInfoServiceImpl.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/service/inout/impl/UdiRelevanceServiceImpl.java rename api-udims/src/main/java/com/glxp/udi/admin/service/{receipts => inout}/impl/UnitMaintainServiceImpl.java (73%) delete mode 100644 api-udims/src/main/java/com/glxp/udi/admin/service/receipts/impl/BussinessTypeServiceImpl.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/thread/TransInoutService.java create mode 100644 api-udims/src/main/java/com/glxp/udi/admin/util/GetAuthAdminUtil.java delete mode 100644 api-udims/src/main/java/com/glxp/udi/admin/util/ReceiptBeanUtils.java create mode 100644 api-udims/src/main/resources/logback-spring.xml create mode 100644 api-udims/src/main/resources/mybatis/mapper/inout/MyErpOrderDao.xml create mode 100644 api-udims/src/main/resources/mybatis/mapper/inout/SetupDao.xml create mode 100644 api-udims/src/main/resources/mybatis/mapper/inout/UdiInfoDao.xml create mode 100644 api-udims/src/main/resources/mybatis/mapper/inout/UdiRelevanceDao.xml create mode 100644 api-udims/src/main/resources/mybatis/mapper/inout/UnitMaintainDao.xml create mode 100644 api-udims/src/main/resources/mybatis/mapper/inout/WarehousetempMapper.xml delete mode 100644 api-udims/src/main/resources/mybatis/mapper/receipt/UnitMaintainDao.xml diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/auth/LoginController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/auth/LoginController.java index ac143f1..78caf3d 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/controller/auth/LoginController.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/controller/auth/LoginController.java @@ -3,13 +3,16 @@ package com.glxp.udi.admin.controller.auth; import com.glxp.udi.admin.annotation.AuthRuleAnnotation; import com.glxp.udi.admin.entity.auth.AuthAdmin; import com.glxp.udi.admin.entity.auth.AuthRoleAdmin; +import com.glxp.udi.admin.entity.auth.CustomerInfoEntity; import com.glxp.udi.admin.exception.JsonException; import com.glxp.udi.admin.req.auth.LoginRequest; import com.glxp.udi.admin.req.auth.UpdatePasswordRequest; +import com.glxp.udi.admin.res.auth.LoginResponse; import com.glxp.udi.admin.res.auth.LoginUserInfoResponse; import com.glxp.udi.admin.service.auth.AuthAdminService; import com.glxp.udi.admin.service.auth.AuthLoginService; import com.glxp.udi.admin.service.auth.AuthRoleAdminService; +import com.glxp.udi.admin.service.auth.CustomerInfoService; import com.glxp.udi.admin.util.IpUtils; import com.glxp.udi.admin.util.JwtUtils; import com.glxp.udi.admin.util.PasswordUtils; @@ -45,6 +48,8 @@ public class LoginController { @Resource private AuthRoleAdminService authRoleAdminService; + @Resource + private CustomerInfoService customerInfoService; /** * 用户登录 @@ -68,7 +73,7 @@ public class LoginController { throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); } - if(authAdmin.getUserFlag() !=1){ + if (authAdmin.getUserFlag() != 1) { throw new JsonException(ResultEnum.DATA_NOT, "该用户账号已被禁用"); } @@ -86,11 +91,18 @@ public class LoginController { claims.put("admin_id", authAdmin.getId()); String token = JwtUtils.createToken(claims, 86400L); // 一天后过期 - Map map = new HashMap<>(); - map.put("id", authAdmin.getId()); - map.put("token", token); - - return ResultVOUtils.success(map); + //获取权限 + List authRules = authLoginService.listRuleIdByAdminId(authAdmin.getId()); + + //获取信用号 + CustomerInfoEntity customerInfoEntity = customerInfoService.selectById(authAdmin.getCustomerId()); + LoginResponse loginResponse = new LoginResponse(); + loginResponse.setAuthRules(authRules); + loginResponse.setId(authAdmin.getId() + ""); + loginResponse.setToken(token); + if (customerInfoEntity != null) + loginResponse.setCreditNum(customerInfoEntity.getCreditNum()); + return ResultVOUtils.success(loginResponse); } /** diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/auth/RegisterController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/auth/RegisterController.java index e3077bd..e7969f5 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/controller/auth/RegisterController.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/controller/auth/RegisterController.java @@ -78,7 +78,7 @@ public class RegisterController { if (checkCodeRequest.getUserName() != null) { AuthAdmin authAdmin = authAdminService.findByUserName(checkCodeRequest.getUserName()); - if(authAdmin==null){ + if (authAdmin == null) { return ResultVOUtils.error(500, "未找到该用户"); } UserRegisterEntity userRegisterEntity = userRegisterService.selectByCustomerId(authAdmin.getCustomerId()); @@ -90,6 +90,17 @@ public class RegisterController { RestTemplate restTemplate = new RestTemplate(); int mobile_code = (int) ((Math.random() * 9 + 1) * 100000); +// if(mobile_code>1){ +// JSONObject json = new JSONObject(); +// json.put("memPhone", checkCodeRequest.getPhoneNum()); +// json.put("code", mobile_code); +// json.put("createTime", System.currentTimeMillis()); +// // 将认证码存入SESSION +// httpSession.setAttribute("code", json); +// log.info(httpSession.getId() + "---" + httpSession); +// return ResultVOUtils.success("发送成功" + " " + mobile_code); +// } + MultiValueMap postParameters = new LinkedMultiValueMap<>(); int time = 5; String content = new String("您正在进行手机验证，验证码是" + mobile_code + "，" + time + "分钟内有效。"); @@ -170,6 +181,10 @@ public class RegisterController { if (isExitPhone) { return ResultVOUtils.error(500, "该手机号已被注册"); } + AuthAdmin authAdmin = authAdminService.findByUserName(userRegisterEntity.getUserId()); + if (authAdmin != null) { + return ResultVOUtils.error(500, "该用户账号已被注册"); + } userRegisterEntity.setRegisterTime(DateUtil.getDateTime()); userRegisterEntity.setCheckType(0);//未审核 boolean b = userRegisterService.insertUserRegister(userRegisterEntity); @@ -235,7 +250,7 @@ public class RegisterController { userRegisterEntity.setCheckTime(DateUtil.getDateTime()); userRegisterEntity.setUserId(userId + ""); boolean b = userRegisterService.updateUserRegister(userRegisterEntity); - if(registerCheckRequest.getCheckType()!=1){ + if (registerCheckRequest.getCheckType() != 1) { return ResultVOUtils.success("修改成功"); } //创建新用户 @@ -264,7 +279,7 @@ public class RegisterController { customerInfoEntity.setCustomerName(userRegisterEntity.getNickName()); customerInfoEntity.setUserFlag(1); customerInfoEntity.setUserMax(2); - customerInfoEntity.setRoleId(registerCheckRequest.getRoles()+""); + customerInfoEntity.setRoleId(registerCheckRequest.getRoles() + ""); customerInfoEntity.setCompanyName(userRegisterEntity.getCompanyName()); List roles = new ArrayList<>(); @@ -295,7 +310,7 @@ public class RegisterController { companyEntity.setMobile(userRegisterEntity.getMobile()); companyEntity.setTel(userRegisterEntity.getTel()); companyEntity.setCompanyName(userRegisterEntity.getCompanyName()); - companyEntity.setClasses(userRegisterEntity.getBussinessStatus()+""); + companyEntity.setClasses(userRegisterEntity.getBussinessStatus() + ""); companyEntity.setCreditNum(userRegisterEntity.getCreditNum()); companyService.insertCompany(companyEntity); diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/info/SetupController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/info/SetupController.java new file mode 100644 index 0000000..f991c09 --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/controller/info/SetupController.java @@ -0,0 +1,38 @@ +package com.glxp.udi.admin.controller.info; + +import com.glxp.udi.admin.entity.info.SetupEntity; +import com.glxp.udi.admin.req.info.FilterSetupRequest; +import com.glxp.udi.admin.service.info.SetupService; +import com.glxp.udi.common.res.BaseResponse; +import com.glxp.udi.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; + +@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-udims/src/main/java/com/glxp/udi/admin/controller/inout/CodeContrastController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/CodeContrastController.java deleted file mode 100644 index 21017e8..0000000 --- a/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/CodeContrastController.java +++ /dev/null @@ -1,183 +0,0 @@ -package com.glxp.udi.admin.controller.inout; - -import com.github.pagehelper.PageInfo; -import com.glxp.udi.admin.annotation.AuthRuleAnnotation; -import com.glxp.udi.admin.entity.auth.AuthAdmin; -import com.glxp.udi.admin.entity.contrast.CodeContrastDetailEntity; -import com.glxp.udi.admin.entity.contrast.CodeContrastEntity; -import com.glxp.udi.admin.entity.contrast.CustomercontrastEntity; -import com.glxp.udi.admin.exception.JsonException; -import com.glxp.udi.admin.req.ListPageRequest; -import com.glxp.udi.admin.req.contrast.CodeContrastRequest; -import com.glxp.udi.admin.req.contrast.DeleteCustomerContrastRequest; -import com.glxp.udi.admin.req.contrast.FilterCodeContrastRequest; -import com.glxp.udi.admin.res.PageSimpleResponse; -import com.glxp.udi.admin.res.contrast.CodeContrastResponse; -import com.glxp.udi.admin.service.auth.AuthAdminService; -import com.glxp.udi.admin.service.contrast.CodeContrastService; -import com.glxp.udi.admin.service.contrast.CustomercontrastService; -import com.glxp.udi.admin.util.UuidUtils; -import com.glxp.udi.common.enums.ResultEnum; -import com.glxp.udi.common.res.BaseResponse; -import com.glxp.udi.common.util.ResultVOUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -@RestController -public class CodeContrastController { - - @Resource - private CodeContrastService codeContrastService; - @Resource - private AuthAdminService authAdminService; - @Resource - private CustomercontrastService customercontrastService; - - //对照码上传 - @AuthRuleAnnotation("") - @PostMapping("/salewarehouse/codeContrast/save") - public BaseResponse saveList(@RequestBody @Valid CodeContrastRequest codeContrastRequest, BindingResult bindingResult) { - - ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - if (attributes == null) { - throw new JsonException(ResultEnum.NOT_NETWORK); - } - HttpServletRequest request = attributes.getRequest(); - String userId = request.getHeader("ADMIN_ID"); - AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); - - List codeContrastEntities = codeContrastRequest.getCodeContrastData(); - List insertData = new ArrayList<>(); - - List customercontrastEntities = new ArrayList<>(); //创建关联关系 - - if (codeContrastEntities != null && codeContrastEntities.size() > 0) { - - for (int i = 0; i < codeContrastEntities.size(); i++) { - - String uuid = UuidUtils.getUUId(); - - CodeContrastEntity codeContrastEntity = codeContrastEntities.get(i); - codeContrastEntity.setUserId(Long.parseLong(userId)); - codeContrastEntity.setCustomerId(authAdmin.getCustomerId()); - codeContrastEntity.setId(uuid); - insertData.add(codeContrastEntity); - - CustomercontrastEntity customercontrastEntity = new CustomercontrastEntity(); - customercontrastEntity.setCodeContrastId(uuid); - customercontrastEntity.setCustomerId(authAdmin.getCustomerId()); - customercontrastEntity.setUserId(Long.parseLong(userId)); - customercontrastEntities.add(customercontrastEntity); - } - } else return ResultVOUtils.error(301, "上传对照数据为空"); - - boolean b = codeContrastService.insertCodeContrastList(insertData); - boolean c = customercontrastService.insertCustomercontrastList(customercontrastEntities); //插入对照表 - if (!b && !c) { - return ResultVOUtils.error(500, "插入数据出错"); - } - return ResultVOUtils.success("添加成功"); - } - - @AuthRuleAnnotation("") - @PostMapping("/salewarehouse/codeContrast/deleteContrastByCustomer") - public BaseResponse deleteCustomerContrast(@RequestBody @Valid DeleteCustomerContrastRequest deleteCustomerContrastRequest, BindingResult bindingResult) { - - ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - if (attributes == null) { - throw new JsonException(ResultEnum.NOT_NETWORK); - } - HttpServletRequest request = attributes.getRequest(); - String userId = request.getHeader("ADMIN_ID"); - AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); - deleteCustomerContrastRequest.setCustomerId(authAdmin.getCustomerId()); - boolean b = customercontrastService.deleteCustomercontrast(deleteCustomerContrastRequest); - if (!b) { - return ResultVOUtils.error(500, "删除失败"); - } - return ResultVOUtils.success("删除成功"); - } - - - //对照码下载 - @AuthRuleAnnotation("") - @GetMapping("/salewarehouse/codeContrast/list") - public BaseResponse listCodeContrast(@Valid ListPageRequest listPageRequest, BindingResult bindingResult) { - - ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - if (attributes == null) { - throw new JsonException(ResultEnum.NOT_NETWORK); - } - HttpServletRequest request = attributes.getRequest(); - String userId = request.getHeader("ADMIN_ID"); - AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); - List codeContrastEntities = codeContrastService.listCodeContrast(listPageRequest, authAdmin.getCustomerId()); - - List codeContrastResponses = codeContrastEntities.stream().map(item -> - { - CodeContrastResponse codeContrastResponse = new CodeContrastResponse(); - BeanUtils.copyProperties(item, codeContrastResponse); - return codeContrastResponse; - }).collect(Collectors.toList()); - - PageInfo pageInfo = new PageInfo<>(codeContrastResponses); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(codeContrastResponses); - return ResultVOUtils.success(pageSimpleResponse); - - } - - - //对照表查询 - @AuthRuleAnnotation("") - @GetMapping("/salewarehouse/codeContrast/filter") - public BaseResponse filterCodeContrast(@Valid FilterCodeContrastRequest filterCodeContrastRequest, BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - List codeContrastEntities = null; - if (filterCodeContrastRequest.getCustomerId() != null) - codeContrastEntities = customercontrastService.filterDetailByCustomerId(filterCodeContrastRequest); - else { - codeContrastEntities = customercontrastService.filterDetailAll(filterCodeContrastRequest); - } - - List codeContrastResponses = codeContrastEntities.stream().map(item -> - { - CodeContrastDetailEntity codeContrastDetailEntity = new CodeContrastDetailEntity(); - BeanUtils.copyProperties(item, codeContrastDetailEntity); - return codeContrastDetailEntity; - }).collect(Collectors.toList()); - - PageInfo pageInfo = new PageInfo<>(codeContrastResponses); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(codeContrastResponses); - return ResultVOUtils.success(pageSimpleResponse); - - } -} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/DruginfoController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/DruginfoController.java deleted file mode 100644 index bfceb35..0000000 --- a/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/DruginfoController.java +++ /dev/null @@ -1,231 +0,0 @@ -package com.glxp.udi.admin.controller.inout; - -import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageInfo; -import com.glxp.udi.admin.entity.inout.Druginfo; -import com.glxp.udi.admin.entity.inout.MipsDrugEntity; -import com.glxp.udi.admin.req.inout.DrugFilterRequest; -import com.glxp.udi.admin.req.inout.DrugInfoRequest; -import com.glxp.udi.admin.req.inout.DrugsSaveRequest; -import com.glxp.udi.admin.res.PageSimpleResponse; -import com.glxp.udi.admin.res.inout.DruginfoResponse; -import com.glxp.udi.admin.res.inout.MipsDrugResponse; -import com.glxp.udi.admin.service.info.CompanyService; -import com.glxp.udi.admin.service.inout.DruginfoService; -import com.glxp.udi.admin.util.HttpClient; -import com.glxp.udi.common.enums.ResultEnum; -import com.glxp.udi.common.res.BaseResponse; -import com.glxp.udi.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; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import javax.validation.Valid; -import java.util.*; -import java.util.stream.Collectors; - -/** - * 药品信息 - */ -@RestController -public class DruginfoController { - - - @Resource - private DruginfoService druginfoService; - @Resource - private CompanyService companyService; - - @Value("${UDIC_MIPSDOWNLOAD_URL}") - private String url; - - @GetMapping("warehouse/drug/list") - public BaseResponse list(@Valid DrugInfoRequest drugInfoRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - List druginfoList = druginfoService.listDrugInfo(drugInfoRequest); - List druginfoResponses = druginfoList.stream().map(item -> - { - DruginfoResponse druginfoResponse = new DruginfoResponse(); - BeanUtils.copyProperties(item, druginfoResponse); - return druginfoResponse; - }).collect(Collectors.toList()); - PageInfo pageInfo = new PageInfo<>(druginfoList); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(druginfoResponses); - return ResultVOUtils.success(pageSimpleResponse); - } - - @GetMapping("warehouse/drug/filter") - public BaseResponse filter(@Valid DrugFilterRequest drugFilterRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - List druginfoList = druginfoService.filterDrugInfo(drugFilterRequest); - - List druginfoResponses = druginfoList.stream().map(item -> - { - DruginfoResponse druginfoResponse = new DruginfoResponse(); - BeanUtils.copyProperties(item, druginfoResponse); - return druginfoResponse; - }).collect(Collectors.toList()); - PageInfo pageInfo = new PageInfo<>(druginfoList); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(druginfoResponses); - return ResultVOUtils.success(pageSimpleResponse); - } - - - /** - * 获取同一种类型的产品信息并合并后返回 - * - * @param drugInfoRequest - * @param bindingResult - * @return - */ - @GetMapping("warehouse/drug/combineFilter") - public BaseResponse combineFilter(@Valid DrugFilterRequest drugInfoRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - - List druginfoList = druginfoService.filterDrugInfo(drugInfoRequest); - Map data = new HashMap<>(); - for (Druginfo druginfo : druginfoList) { - data.put(druginfo.getUuid(), druginfo); - } - List returnLists = new ArrayList<>(); - for (Druginfo value : data.values()) { - returnLists.add(value); - } - for (int i = 0; i < returnLists.size(); i++) { - String nameCode = returnLists.get(i).getNamecode(); - if (druginfoService.isExit(nameCode)) { - returnLists.get(i).setCheck(true); - } else - returnLists.get(i).setCheck(false); - } - - - List druginfoResponses = returnLists.stream().map(item -> - { - DruginfoResponse druginfoResponse = new DruginfoResponse(); - BeanUtils.copyProperties(item, druginfoResponse); - return druginfoResponse; - }).collect(Collectors.toList()); - PageInfo pageInfo = new PageInfo<>(druginfoList); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(druginfoResponses); - return ResultVOUtils.success(pageSimpleResponse); - } - - /** - * 导入TXT药品信息 - * - * @param drugsSaveRequest - * @param bindingResult - * @return - */ - @PostMapping("/warehouse/drug/save") - public BaseResponse saveList(@RequestBody @Valid DrugsSaveRequest drugsSaveRequest, BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - List druginfos = drugsSaveRequest.getDruginfos(); - List saveList = addUuid(druginfos); - drugsSaveRequest.setDruginfos(saveList); - int b = druginfoService.saveDruginfo(drugsSaveRequest); - System.out.println(b + "-------------------"); - if (b < 0) { - return ResultVOUtils.error(ResultEnum.NOT_NETWORK); - } - - return ResultVOUtils.success("添加成功"); - } - - public List addUuid(List druginfos){ - Map> data = new HashMap<>(); - for (Druginfo druginfo : druginfos) { - String key = druginfo.getConame() + druginfo.getFormspec() + druginfo.getPackspec() + druginfo.getPackratio(); - if (data.get(key) == null) { - List values = new ArrayList<>(); - values.add(druginfo); - data.put(key, values); - } else { - List values = data.get(key); - values.add(druginfo); - } - - } - List saveList = new ArrayList<>(); - for (List druginfoList : data.values()) { - String uuid = getUUId(); - for (int i = 0; i < druginfoList.size(); i++) { - Druginfo druginfo = druginfoList.get(i); - druginfo.setUuid(uuid); - saveList.add(druginfo); - } - } - return saveList; - } - - private String getUUId() { - UUID uuid = UUID.randomUUID(); - return uuid.toString().replace("-", ""); - } - - @GetMapping("warehouse/drug/import") - public BaseResponse importMips() { - String response = HttpClient.mipsGet(url + "/mips/druginfo/list"); - MipsDrugResponse mipsDrugResponse = (MipsDrugResponse) JSONObject.parseObject(response, MipsDrugResponse.class); - if (mipsDrugResponse.getCode() == 20000) { -// CompanyEntity companyEntity = companyService.findCompany(); - List mipsDrugEntities = mipsDrugResponse.getData().getList(); - List druginfoResponses = mipsDrugEntities.stream().map(item -> - { - Druginfo druginfo = new Druginfo(); - BeanUtils.copyProperties(item, druginfo); - druginfo.setNamecode(item.getCodeVersion() + item.getResCode()); - if ("1".equals(item.getProductType())) { - druginfo.setType("监管药品"); - } else if ("2".equals(item.getProductType())) { - druginfo.setType("非国家监管药品"); - } - - druginfo.setConame(item.getProductName()); - druginfo.setAuthcode(item.getAuthorizedNo()); - druginfo.setForm(item.getType()); - druginfo.setFormspec(item.getSpec()); - druginfo.setPackspec(item.getPackageSpec()); - druginfo.setPackratio(item.getPkgRatio()); - druginfo.setPacklevel(item.getCodeLevel()); -// druginfo.setUnit(companyEntity.getName()); - return druginfo; - }).collect(Collectors.toList()); - List saveList = addUuid(druginfoResponses); - DrugsSaveRequest drugsSaveRequest = new DrugsSaveRequest(); - drugsSaveRequest.setDruginfos(saveList); - int b = druginfoService.saveDruginfo(drugsSaveRequest); - System.out.println(b + "-------------------"); - if (b < 0) { - return ResultVOUtils.error(ResultEnum.NOT_NETWORK); - } - return ResultVOUtils.success("导入成功"); - } else { - return ResultVOUtils.error(911, "导入失败"); - } - } - - - -} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/InoutUtils.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/InoutUtils.java new file mode 100644 index 0000000..f08ce99 --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/InoutUtils.java @@ -0,0 +1,312 @@ +package com.glxp.udi.admin.controller.inout; + + +import com.glxp.udi.admin.constant.TypeConstant; +import com.glxp.udi.admin.entity.info.SetupEntity; +import com.glxp.udi.admin.entity.inout.*; +import com.glxp.udi.admin.entity.udid.UdiEntity; +import com.glxp.udi.admin.req.inout.FilterWarehouseRequest; +import com.glxp.udi.admin.service.info.SetupService; +import com.glxp.udi.admin.service.inout.MyErpOrderService; +import com.glxp.udi.admin.service.inout.UdiInfoService; +import com.glxp.udi.admin.service.inout.UdiRelevanceService; +import com.glxp.udi.admin.service.inout.WarehouseService; +import com.glxp.udi.admin.service.receipts.ProductInfoService; +import com.glxp.udi.admin.util.FilterUdiUtils; +import com.glxp.udi.admin.util.WarehousBeanUtils; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class InoutUtils { + String udiUrl = ""; + + public InoutUtils() { + + } + + public InoutUtils(String udiUrl) { + this.udiUrl = udiUrl; + } + + public String filterCode(WarehouseService warehouseService, Warehousetemp warehousetemp, SetupService setupService) { + SetupEntity setupEntity = setupService.selectSetup(); + FilterWarehouseRequest filterWarehouseRequest = new FilterWarehouseRequest(); + filterWarehouseRequest.setCode(warehousetemp.getCode()); + filterWarehouseRequest.setCustomerId(warehousetemp.getCustomerId()); + List warehouseEntityList = warehouseService.findByCode(filterWarehouseRequest); + WarehouseEntity warehouseData = new WarehousBeanUtils().tempToEntity(warehousetemp); + if (warehouseEntityList == null || warehouseEntityList.size() == 0) { //数据库为null,可以添加 + return nullVail(warehousetemp, setupEntity); + } + List inList = new ArrayList<>(); + List outList = new ArrayList<>(); + if (warehouseEntityList != null && warehouseEntityList.size() > 0) { + for (int i = 0; i < warehouseEntityList.size(); i++) { + WarehouseEntity temp = warehouseEntityList.get(i); + if (temp.getAction().equals(TypeConstant.TYPE_CODE_DESTORY)) { //过滤已销毁的 + return getErrMsg(temp); + } + if (temp.getAction().equals(TypeConstant.TYPE_STOCK_CHECK)) { //过滤已盘点 + if (warehouseData.getAction().equals(TypeConstant.TYPE_STOCK_CHECK)) { + return warehouseData.getCode() + "该码已盘点"; + } + } + if (temp.getMainAction().equals(TypeConstant.TYPE_OUT)) { + outList.add(temp); + } else if (temp.getMainAction().equals(TypeConstant.TYPE_PUT)) { + inList.add(temp); + } + } + //如果序列号未null则不判断是否重码 + UdiEntity udiEntity = FilterUdiUtils.getUdi(warehouseData.getCode()); + if (udiEntity.getSerialNo() == null) { + String serialMsg = serialVail(warehouseData, inList, outList); + if (serialMsg != null) { + return serialMsg; + } + return null; + } + + //如果数据库存在1个出库，则可以再录入1个入库;（同理：存在4个出库，3个入库，则可以再录入1个入库） + if (outList.size() - inList.size() == 1) { + if (warehouseData.getMainAction().equals(TypeConstant.TYPE_PUT)) { + return null; + } + } else if (inList.size() - outList.size() == 1) { + if (warehouseData.getMainAction().equals(TypeConstant.TYPE_OUT)) { + WarehouseEntity in = inList.get(inList.size() - 1); + return null; + } + } else if (inList.size() - outList.size() == 0) { + return null; + } else { + return warehousetemp.getCode() + "条码重复"; + } + return warehousetemp.getCode() + "条码重复"; + } + return null; + } + + public String serialVail(WarehouseEntity warehouseData, List inList, List outList) { + for (int i = 0; i < inList.size(); i++) { + if (warehouseData.getCorpOrderId().equals(inList.get(i).getCorpOrderId())) { + return warehouseData.getCode() + "条码重复"; + } + } + for (int i = 0; i < outList.size(); i++) { + if (warehouseData.getCorpOrderId().equals(outList.get(i).getCorpOrderId())) { + return warehouseData.getCode() + "条码重复"; + } + } + return null; + } + + public String nullVail(Warehousetemp warehousetemp, SetupEntity setupEntity) { + if (warehousetemp.getAction().equals(TypeConstant.TYPE_PUT_RETURN)) { + if (setupEntity.isReturnWareHouseIn()) { + return null; + } else { + return warehousetemp.getCode() + "不允许未销售出库可以采购入库"; + } + } else if (warehousetemp.getAction().equals(TypeConstant.TYPE_OUT_RETURN)) { + if (setupEntity.isReturnWareHouseOut()) { + return null; + } else { + return warehousetemp.getCode() + "不允许零库存退货出库"; + } + } else if (warehousetemp.getAction().equals(TypeConstant.TYPE_OUT_SALE)) { + if (setupEntity.isReturnWareHouseOut()) { + return null; + } else { + return warehousetemp.getCode() + "不允许零库存销售出库"; + } + } + return null; + } + + public String getErrMsg(WarehouseEntity warehousetemp) { + if (warehousetemp.getAction().equals(TypeConstant.TYPE_PUT_PRODUCT)) { + return warehousetemp.getCode() + "已生产入库"; + } else if (warehousetemp.getAction().equals(TypeConstant.TYPE_PUT_PURCHASE)) { + return warehousetemp.getCode() + "已采购入库"; + } else if (warehousetemp.getAction().equals(TypeConstant.TYPE_PUT_RETURN)) { + return warehousetemp.getCode() + "已退货入库"; + } else if (warehousetemp.getAction().equals(TypeConstant.TYPE_PUT_ALLOT)) { + return warehousetemp.getCode() + "已调拨入库"; + } else if (warehousetemp.getAction().equals(TypeConstant.TYPE_OUT_SALE)) { + return warehousetemp.getCode() + "已销售出库"; + } else if (warehousetemp.getAction().equals(TypeConstant.TYPE_OUT_RETURN)) { + return warehousetemp.getCode() + "已退货出库"; + } else if (warehousetemp.getAction().equals(TypeConstant.TYPE_OUT_ALLOT)) { + return warehousetemp.getCode() + "已调拨出库"; + } else if (warehousetemp.getAction().equals(TypeConstant.TYPE_OUT_DESTORY)) { + return warehousetemp.getCode() + "已销毁出库"; + } else if (warehousetemp.getAction().equals(TypeConstant.TYPE_OUT_STRAIGHT)) { + return warehousetemp.getCode() + "已直调出库"; + } else if (warehousetemp.getAction().equals(TypeConstant.TYPE_OUT_REWORK)) { + return warehousetemp.getCode() + "已返工出库"; + } else if (warehousetemp.getAction().equals(TypeConstant.TYPE_OUT_CHECK)) { + return warehousetemp.getCode() + "已抽检出库"; + } else if (warehousetemp.getAction().equals(TypeConstant.TYPE_CODE_DESTORY)) { + return warehousetemp.getCode() + "已销毁"; + } + return warehousetemp.getCode() + "出错"; + } + + + public void generateOrderDetail(ProductInfoService productInfoService, List warehouseEntityList) { + //把所有药监码分类 + Map> sortMap = new HashMap<>(); + for (WarehouseEntity warehouseEntity : warehouseEntityList) { + String code = warehouseEntity.getCode().substring(0, 7); + List warehouseEntities = sortMap.get(code); + if (warehouseEntities == null) { + warehouseEntities = new ArrayList<>(); + } + warehouseEntities.add(warehouseEntity); + sortMap.put(code, warehouseEntities); + } + + //获取所有产品编码 + List nameCodes = new ArrayList<>(); + for (String key : sortMap.keySet()) { + nameCodes.add(key); + } + + //获取药品信息并计算数量 + List orderDetailEntities = productInfoService.findByCodes(nameCodes); + for (int i = 0; i < orderDetailEntities.size(); i++) { + List warehouseEntities = sortMap.get(orderDetailEntities.get(i).getNameCode()); + if (warehouseEntities != null) { + int odCount = orderDetailEntities.get(i).getBhzxxsbzsl(); + if (odCount > 0) { + orderDetailEntities.get(i).setCount(warehouseEntities.size() * odCount); + } else { + orderDetailEntities.get(i).setCount(warehouseEntities.size()); + } + + } + } + List returnOrderDetail = new ArrayList<>(); + Map detailEntityMap = new HashMap<>(); + for (OrderDetailEntity orderDetailEntity : orderDetailEntities) { + String key = orderDetailEntity.getCoName() + orderDetailEntity.getFormSpec() + orderDetailEntity.getPackSpec() + orderDetailEntity.getPackRatio(); + OrderDetailEntity temp = detailEntityMap.get(key); + if (temp != null) { + orderDetailEntity.setCount(temp.getCount() + orderDetailEntity.getCount()); + } + detailEntityMap.put(key, orderDetailEntity); + } + for (Map.Entry entry : detailEntityMap.entrySet()) { + System.out.println("key = " + entry.getKey() + ", value = " + entry.getValue()); + returnOrderDetail.add(entry.getValue()); + } + } + + + public ErpDetailCodeEntity getDetailCode(ProductInfoService productInfoService, String code) { + ErpDetailCodeEntity detailCodeEntity = productInfoService.getDetailCode(code); + if (detailCodeEntity == null) { + detailCodeEntity = productInfoService.getDetailCodeNoBh(code); + } + return detailCodeEntity; + } + + public UdiInfoEntity getUdiInfo(UdiInfoService udiInfoService, UdiRelevanceService udiRelevanceService, String code) { + String prefix; + prefix = FilterUdiUtils.getDiStr(code); + UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(prefix); + if (udiInfoEntity == null) { +// udiInfoEntity = new UdiInfoEntity(); + List froms = new UdiDlHttpClient(udiUrl).getUdiByDi(prefix); + if (froms != null && !froms.isEmpty()) { +// udiInfoService.insertUdiInfos(froms); + udiInfoEntity = froms.get(0); + List udiInfoEntities = new UdiDlHttpClient(udiUrl).getUdiByUuid(udiInfoEntity.getUuid()); + if (udiInfoEntities != null) { + for (UdiInfoEntity temp : udiInfoEntities) { + udiInfoEntity.setCustomerId(temp.getCustomerId() + ""); + } + udiInfoService.insertUdiInfos(udiInfoEntities); + } +// udiInfoService.findByNameCode(prefix); +// UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); +// udiRelevanceEntity.setUuid(udiInfoEntity.getUuid()); +// udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); +// udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); + } else { + udiInfoEntity = new UdiInfoEntity(); + } + } + udiInfoEntity.setCode(code); + udiInfoEntity = FilterUdiUtils.transUdi(udiInfoEntity); + return udiInfoEntity; + } + + public void generateConstrastDetail(UdiInfoService udiInfoService, UdiRelevanceService udiRelevanceService, + MyErpOrderService myErpOrderService, + List warehouseEntityList) { + if (warehouseEntityList != null && warehouseEntityList.size() > 0) { + List udiInfoEntities = new ArrayList<>(); + for (WarehouseEntity warehouseEntity : warehouseEntityList) { + UdiInfoEntity udiInfoEntity = getUdiInfo(udiInfoService, udiRelevanceService, warehouseEntity.getCode()); + if (udiInfoEntity != null) { + if (warehouseEntity.getCount() != null) + udiInfoEntity.setCount(warehouseEntity.getCount()); + else { + udiInfoEntity.setCount(getActCount(udiInfoEntity)); + } + udiInfoEntities.add(udiInfoEntity); + } + } + + List returnOrderDetail = new ArrayList<>(); + Map sortMaps = new HashMap<>(); + for (UdiInfoEntity detailCodeEntity : udiInfoEntities) { + String key = detailCodeEntity.getBatchNo() + detailCodeEntity.getCpmctymc(); + UdiInfoEntity temp = sortMaps.get(key); + if (temp != null) { + detailCodeEntity.setCount(temp.getCount() + detailCodeEntity.getCount()); + } + sortMaps.put(key, detailCodeEntity); + } + + for (Map.Entry entry : sortMaps.entrySet()) { + System.out.println("key = " + entry.getKey() + ", value = " + entry.getValue()); + returnOrderDetail.add(entry.getValue()); + } + + List erpOrderEntities = new ArrayList<>(); + for (UdiInfoEntity erpDetailCodeEntity : returnOrderDetail) { + ErpOrderEntity erpOrderEntity = new ErpOrderEntity(); + erpOrderEntity.setNameCode(erpDetailCodeEntity.getNameCode()); + erpOrderEntity.setPackRatio(erpDetailCodeEntity.getPackRatio()); + erpOrderEntity.setCoName(erpDetailCodeEntity.getCpmctymc()); + erpOrderEntity.setLotno(erpDetailCodeEntity.getBatchNo()); + erpOrderEntity.setCount(erpDetailCodeEntity.getCount()); + erpOrderEntity.setOrderIdFk(warehouseEntityList.get(0).getOrderId()); + erpOrderEntity.setProductCompany(erpDetailCodeEntity.getYlqxzcrbarmc()); + erpOrderEntity.setAuthCode(erpDetailCodeEntity.getZczbhhzbapzbh()); + erpOrderEntity.setPackSpec(erpDetailCodeEntity.getGgxh()); + erpOrderEntities.add(erpOrderEntity); + } + if (!erpOrderEntities.isEmpty()) + myErpOrderService.insertErpOrders(erpOrderEntities); + } + } + + public int getActCount(UdiInfoEntity udiInfoBean) { + if (udiInfoBean != null) { + if (udiInfoBean.getZxxsbzbhsydysl() > 1) { + return udiInfoBean.getZxxsbzbhsydysl() * udiInfoBean.getBhzxxsbzsl(); + } else { + return udiInfoBean.getBhzxxsbzsl(); + } + } + + return 1; + } +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/MyErpOrderController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/MyErpOrderController.java new file mode 100644 index 0000000..067782f --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/MyErpOrderController.java @@ -0,0 +1,79 @@ +package com.glxp.udi.admin.controller.inout; + +import com.github.pagehelper.PageInfo; +import com.glxp.udi.admin.entity.inout.ErpOrderEntity; +import com.glxp.udi.admin.req.inout.DeleteRequest; +import com.glxp.udi.admin.req.inout.FilterErpOrderRequest; +import com.glxp.udi.admin.res.PageSimpleResponse; +import com.glxp.udi.admin.service.inout.MyErpOrderService; +import com.glxp.udi.common.enums.ResultEnum; +import com.glxp.udi.common.res.BaseResponse; +import com.glxp.udi.common.util.ResultVOUtils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +@RestController +public class MyErpOrderController { + @Value("${UCLOD_SERVER_URL}") + private String ucloudUrl; + @Resource + MyErpOrderService myErpOrderService; + + @GetMapping("/warehouse/getMyErpOrders") + public BaseResponse getMyErpOrders(FilterErpOrderRequest filterErpOrderRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (filterErpOrderRequest.getDocid() == null || filterErpOrderRequest.getDocid().equals("")) { + filterErpOrderRequest.setDocid("null"); + } + List erpInfoEntityList = myErpOrderService.filterMyErpDetailOrder(filterErpOrderRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(erpInfoEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(erpInfoEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @PostMapping("/warehouse/deleteErpOrder") + public BaseResponse deleteErpOrder(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + boolean b = myErpOrderService.deleteById(deleteRequest.getId()); + if (b) { + return ResultVOUtils.success("删除成功"); + } else { + return ResultVOUtils.error(500, "删除失败"); + } + } + + @GetMapping(value = "/warehouse/inout/order/detail") + public BaseResponse orderDetail(FilterErpOrderRequest filterErpOrderRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (filterErpOrderRequest.getOrderId() == null || filterErpOrderRequest.getOrderId().equals("")) { + filterErpOrderRequest.setOrderId("1"); + } + filterErpOrderRequest.setPage(1); + filterErpOrderRequest.setLimit(100); + List erpOrderEntities = myErpOrderService.filterMyErpOrder(filterErpOrderRequest); + return ResultVOUtils.success(erpOrderEntities); + } + + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/OrderController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/OrderController.java index 057b12e..d5c344f 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/OrderController.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/OrderController.java @@ -1,12 +1,20 @@ package com.glxp.udi.admin.controller.inout; import com.github.pagehelper.PageInfo; +import com.glxp.udi.admin.annotation.AuthRuleAnnotation; +import com.glxp.udi.admin.entity.auth.AuthAdmin; +import com.glxp.udi.admin.entity.info.SetupEntity; +import com.glxp.udi.admin.entity.inout.ErpOrderEntity; import com.glxp.udi.admin.entity.inout.OrderEntity; import com.glxp.udi.admin.entity.inout.WarehouseEntity; +import com.glxp.udi.admin.exception.JsonException; import com.glxp.udi.admin.req.inout.*; import com.glxp.udi.admin.res.PageSimpleResponse; -import com.glxp.udi.admin.service.inout.OrderService; -import com.glxp.udi.admin.service.inout.WarehouseService; +import com.glxp.udi.admin.service.auth.AuthAdminService; +import com.glxp.udi.admin.service.info.SetupService; +import com.glxp.udi.admin.service.inout.*; +import com.glxp.udi.admin.service.receipts.MipsBarcodeService; +import com.glxp.udi.admin.util.GetAuthAdminUtil; import com.glxp.udi.common.enums.ResultEnum; import com.glxp.udi.common.res.BaseResponse; import com.glxp.udi.common.util.ResultVOUtils; @@ -16,10 +24,15 @@ 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 org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.Resource; import javax.validation.Valid; +import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; @RestController public class OrderController { @@ -28,8 +41,87 @@ public class OrderController { private OrderService orderService; @Resource private WarehouseService warehouseService; + @Resource + private MyErpOrderService myErpOrderService; + @Resource + private MipsBarcodeService mipsBarcodeService; + @Resource + private UdiInfoService udiInfoService; + @Resource + private UdiRelevanceService udiRelevanceService; + @Resource + private SetupService setupService; + @Resource + AuthAdminService authAdminService; + + @AuthRuleAnnotation("") + @GetMapping("/warehouse/inout/order/filter") + public BaseResponse filterOrder(OrderFilterRequest orderFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + AuthAdmin authAdmin = new GetAuthAdminUtil(authAdminService).getAuthAdmin(attributes); + orderFilterRequest.setCustomerId(authAdmin.getCustomerId()); + orderFilterRequest.setStatus("success"); + List orderEntityList; + if (orderFilterRequest.getCode() != null && !orderFilterRequest.getCode().equals("")) { + FilterWarehouseRequest filterWarehouseRequest = new FilterWarehouseRequest(); + filterWarehouseRequest.setCustomerId(authAdmin.getCustomerId()); + filterWarehouseRequest.setCode(orderFilterRequest.getCode()); + List warehouseEntityList = warehouseService.findByCode(filterWarehouseRequest); + orderEntityList = orderService.filterListByCode(warehouseEntityList); + } else { + orderEntityList = orderService.filterList(orderFilterRequest); + } + + PageInfo pageInfo; + pageInfo = new PageInfo<>(orderEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(orderEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } + @AuthRuleAnnotation("") + @GetMapping("/warehouse/inout/order/filterCode") + public BaseResponse filterOrderByCode(OrderFilterByCodeRequest orderFilterByCodeRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + AuthAdmin authAdmin = new GetAuthAdminUtil(authAdminService).getAuthAdmin(attributes); + FilterWarehouseRequest filterWarehouseRequest = new FilterWarehouseRequest(); + filterWarehouseRequest.setCustomerId(authAdmin.getCustomerId()); + filterWarehouseRequest.setCode(orderFilterByCodeRequest.getCode()); + List warehouseEntityList = warehouseService.findByCode(filterWarehouseRequest); + List orderEntityList = orderService.filterListByCode(warehouseEntityList); + PageInfo pageInfo; + pageInfo = new PageInfo<>(orderEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(orderEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } + + /** + * -----------------------暂不确定---------------------- + */ + + + @AuthRuleAnnotation("") @GetMapping("admin/warehouse/inout/order/list") public BaseResponse list(OrderQueryRequest orderQueryRequest) { List orderEntityList = orderService.listOrders(orderQueryRequest); @@ -42,7 +134,7 @@ public class OrderController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @GetMapping("admin/warehouse/inout/order/listerror") public BaseResponse listOrderError(OrderQueryRequest orderQueryRequest) { List orderEntityList = orderService.listOrderError(orderQueryRequest); @@ -54,6 +146,7 @@ public class OrderController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @GetMapping("admin/warehouse/inout/order/listRepeat") public BaseResponse listOrderRepeat(OrderQueryRequest orderQueryRequest) { List orderEntityList = orderService.listOrderRepeat(orderQueryRequest); @@ -65,6 +158,7 @@ public class OrderController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @PostMapping("admin/warehouse/inout/order/save") public BaseResponse save(@RequestBody @Valid OrderEntity orderSaveRequest, BindingResult bindingResult) { @@ -79,31 +173,107 @@ public class OrderController { if (!b) { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); } - return ResultVOUtils.success("添加成功"); } - + @AuthRuleAnnotation("") @PostMapping("/warehouse/inout/order/mergeOrder") public BaseResponse mergeOrder(@RequestBody OrderMergeRequest orderMergeRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + List orderList = orderMergeRequest.getOrderList(); - if (orderList != null && orderList.size() > 1) { - String mainOrder = orderList.get(0); - for (int i = 1; i < orderList.size(); i++) { - warehouseService.updateOrderId(orderList.get(i), mainOrder); - orderService.deleteByOrderId(orderList.get(i)); + SetupEntity setupEntity = setupService.selectSetup(); + if (!setupEntity.isForbidSameErp()) { + List mergeList = new ArrayList<>(); + if (orderList != null && orderList.size() > 1) { + for (String orderId : orderList) { + FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest(); + filterErpOrderRequest.setOrderId(orderId); + List erpOrderEntities = myErpOrderService.filterAllMyErpOrder(filterErpOrderRequest); + if (erpOrderEntities != null && erpOrderEntities.size() > 0) { + mergeList.addAll(erpOrderEntities); + } + myErpOrderService.deleteByOrderId(orderId); + + } + String mainOrder = orderList.get(0); + for (int i = 1; i < orderList.size(); i++) { + warehouseService.updateOrderId(orderList.get(i), mainOrder); + orderService.deleteByOrderId(orderList.get(i)); + } + OrderEntity mainOrderEntity = orderService.findById(mainOrder); + List docids = getDocids(mergeList); + String docidStr = ""; + if (docids != null && docids.size() > 0) { + for (String temp : docids) { + docidStr = docidStr + "," + temp; + } + docidStr = docidStr.substring(1); + } + mainOrderEntity.setErpFk(docidStr); + orderService.updateOrder(mainOrderEntity); +// List erpOrderEntities = new UCloudHttpClient(ucloudUrl).getErpOrders(docids, mainOrderEntity.getAction()); +// if (erpOrderEntities != null && erpOrderEntities.size() > 0) { +// List returnOrders = new ContrastErpUtil().transErp(erpOrderEntities, udiRelevanceService, mainOrder); +// myErpOrderService.insertErpOrders(returnOrders); +// List warehouseEntityList = warehouseService.findByReceiptId(mainOrder); +// new ContrastErpUtil().contrastErp(udiInfoService, udiRelevanceService, myErpOrderService, orderService, warehouseEntityList,setupService); +// } else { +// orderService.updateContrastStatus(mainOrder, "error"); +// orderService.updateRemark(mainOrder, "U8Cloud获取ERP单失败"); +// return ResultVOUtils.error(500, "U8Cloud获取ERP单失败"); +// } + } else { + return ResultVOUtils.error(ResultEnum.DATA_ERROR); } } else { - return ResultVOUtils.error(ResultEnum.DATA_ERROR); + if (orderList != null && orderList.size() > 1) { + for (String orderId : orderList) { + FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest(); + filterErpOrderRequest.setOrderId(orderId); + List erpOrderEntities = myErpOrderService.filterAllMyErpOrder(filterErpOrderRequest); + if (erpOrderEntities != null && erpOrderEntities.size() > 0) { + for (ErpOrderEntity erpOrderEntity : erpOrderEntities) { + if (erpOrderEntity.getDocid() != null) { + return ResultVOUtils.error(500, "已校验过订单不能合并！"); + } + } + } + myErpOrderService.deleteByOrderId(orderId); + } + String mainOrder = orderList.get(0); + for (int i = 1; i < orderList.size(); i++) { + warehouseService.updateOrderId(orderList.get(i), mainOrder); + orderService.deleteByOrderId(orderList.get(i)); + } + new Thread(() -> { + List datas = warehouseService.findByReceiptId(mainOrder); + new InoutUtils().generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, datas); + }).start(); + } } - return ResultVOUtils.success("合并成功"); + + return ResultVOUtils.success("合并成功,后台正在数据转换，请稍后刷新重试！"); } + public List getDocids(List mergeList) { + List docids = new ArrayList<>(); + Map> mapErps = mergeList.stream().collect(Collectors.groupingBy(ErpOrderEntity::getDocid)); + for (String key : mapErps.keySet()) { + docids.add(key); + } + return docids; + } + + + public boolean isSameUnit() { + return false; + } + @PostMapping("warehouse/inout/order/deleteOrder") public BaseResponse deleteOrder(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -113,7 +283,7 @@ public class OrderController { String id = deleteRequest.getId(); orderService.deleteById(id); - + myErpOrderService.deleteByOrderId(id); return ResultVOUtils.success("删除成功"); } @@ -146,49 +316,12 @@ public class OrderController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } boolean b = orderService.updateExportStatus(updateExportStatusRequest.getOrderId(), updateExportStatusRequest.getExportStatus()); + List codes = orderService.findCodesById(updateExportStatusRequest.getOrderId()); + mipsBarcodeService.updateDtFlag(codes); if (!b) { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); } return ResultVOUtils.success("更新成功"); } - @GetMapping("/warehouse/inout/order/filter") - public BaseResponse filterOrder(OrderFilterRequest orderFilterRequest, - BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - List orderEntityList; - if (orderFilterRequest.getCode() != null && !orderFilterRequest.getCode().equals("")) { - List warehouseEntityList = warehouseService.findByCode(orderFilterRequest.getCode()); - orderEntityList = orderService.filterListByCode(warehouseEntityList); - } else { - orderEntityList = orderService.filterList(orderFilterRequest); - } - - PageInfo pageInfo; - pageInfo = new PageInfo<>(orderEntityList); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(orderEntityList); - return ResultVOUtils.success(pageSimpleResponse); - } - - @GetMapping("/warehouse/inout/order/filterCode") - public BaseResponse filterOrderByCode(OrderFilterByCodeRequest orderFilterByCodeRequest, - BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - List warehouseEntityList = warehouseService.findByCode(orderFilterByCodeRequest.getCode()); - List orderEntityList = orderService.filterListByCode(warehouseEntityList); - PageInfo pageInfo; - pageInfo = new PageInfo<>(orderEntityList); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(orderEntityList); - return ResultVOUtils.success(pageSimpleResponse); - } } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/UdiDlHttpClient.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/UdiDlHttpClient.java new file mode 100644 index 0000000..c7b7f0b --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/UdiDlHttpClient.java @@ -0,0 +1,57 @@ +package com.glxp.udi.admin.controller.inout; + +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; +import com.glxp.udi.admin.entity.inout.UdiInfoEntity; +import com.glxp.udi.admin.util.HttpClient; +import com.glxp.udi.common.res.BaseResponse; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class UdiDlHttpClient { + String udiUrl; + + public UdiDlHttpClient(String udiUrl) { + this.udiUrl = udiUrl; + } + + public List getUdiByUuid(String uuid) { + Map paramMap = new HashMap<>(16); + paramMap.put("page", 1); + paramMap.put("limit", 100); + paramMap.put("uuid", uuid); + String response = HttpClient.mipsGet(udiUrl + "/udidl/device/filterByUuid", paramMap); + try { + BaseResponse> udiDlDeviceResponse = + JSONObject.parseObject(response, new TypeReference>>(){ + + }); + List udiInfoEntities = udiDlDeviceResponse.getData(); + return udiInfoEntities; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getUdiByDi(String key) { + Map paramMap = new HashMap<>(16); + paramMap.put("page", 1); + paramMap.put("limit", 100); + paramMap.put("nameCode", key); + String response = HttpClient.mipsGet(udiUrl + "/udidl/device/filterByNameCode", paramMap); + try { + BaseResponse> udiDlDeviceResponse = + JSONObject.parseObject(response, new TypeReference>>(){ + + }); + List udiInfoEntities = udiDlDeviceResponse.getData(); + return udiInfoEntities; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/UdiInfoController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/UdiInfoController.java new file mode 100644 index 0000000..ce19ea5 --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/UdiInfoController.java @@ -0,0 +1,115 @@ +package com.glxp.udi.admin.controller.inout; + +import com.alibaba.fastjson.JSONObject; +import com.glxp.udi.admin.annotation.AuthRuleAnnotation; +import com.glxp.udi.admin.entity.auth.AuthAdmin; +import com.glxp.udi.admin.entity.inout.UdiInfoEntity; +import com.glxp.udi.admin.entity.udid.UdiEntity; +import com.glxp.udi.admin.exception.JsonException; +import com.glxp.udi.admin.req.inout.FilterUdiInfoRequest; +import com.glxp.udi.admin.res.PageSimpleResponse; +import com.glxp.udi.admin.service.auth.AuthAdminService; +import com.glxp.udi.admin.service.inout.UdiInfoService; +import com.glxp.udi.admin.util.FilterUdiUtils; +import com.glxp.udi.admin.util.GetAuthAdminUtil; +import com.glxp.udi.admin.util.HttpClient; +import com.glxp.udi.common.enums.ResultEnum; +import com.glxp.udi.common.res.BaseResponse; +import com.glxp.udi.common.util.ResultVOUtils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@RestController +public class UdiInfoController { + + @Resource + UdiInfoService udiInfoService; + @Resource + AuthAdminService authAdminService; + + @Value("${UDI_SERVER_URL}") + private String udiUrl; + + @GetMapping("udi/udiinfo/filterUdi") + public BaseResponse filterUdi(FilterUdiInfoRequest productInfoFilterRequest) { + + + String nameCode = null; + if (productInfoFilterRequest.getNameCode() != null) { + UdiEntity udiEntity = FilterUdiUtils.getUdi(productInfoFilterRequest.getNameCode()); + if (udiEntity != null) { + nameCode = udiEntity.getUdi(); + } else { + nameCode = productInfoFilterRequest.getNameCode(); + } + } + Map paramMap = new HashMap<>(16); + paramMap.put("page", productInfoFilterRequest.getPage()); + paramMap.put("limit", productInfoFilterRequest.getLimit()); + paramMap.put("ylqxzcrbarmc", productInfoFilterRequest.getYlqxzcrbarmc()); + paramMap.put("cpmctymc", productInfoFilterRequest.getCpmctymc()); + paramMap.put("nameCode", nameCode); + paramMap.put("ggxh", productInfoFilterRequest.getGgxh()); + paramMap.put("uuid", productInfoFilterRequest.getUuid()); + + String response = HttpClient.mipsGet(udiUrl + "/udidl/device/filterUdi", paramMap); + try { + BaseResponse> udiDlDeviceResponse = (BaseResponse>) JSONObject.parseObject(response, BaseResponse.class); + return udiDlDeviceResponse; + } catch (Exception e) { + e.printStackTrace(); + return ResultVOUtils.error(500, "连接UDI数据下载服务出错！"); + } + } + + @GetMapping("udi/udiinfo/filterByUuid") + public BaseResponse filterByUuid(FilterUdiInfoRequest productInfoFilterRequest) { + + Map paramMap = new HashMap<>(16); + paramMap.put("page", productInfoFilterRequest.getPage()); + paramMap.put("limit", productInfoFilterRequest.getLimit()); + String response = HttpClient.mipsGet(udiUrl + "/udidl/device/filterUdi", paramMap); + try { + BaseResponse> udiDlDeviceResponse = (BaseResponse>) JSONObject.parseObject(response, BaseResponse.class); + return udiDlDeviceResponse; + } catch (Exception e) { + e.printStackTrace(); + return ResultVOUtils.error(500, "连接UDI数据下载服务出错！"); + } + } + + @AuthRuleAnnotation("") + @GetMapping("udi/udiinfo/local/filterByUuid") + public BaseResponse filterLocalByUuid(FilterUdiInfoRequest productInfoFilterRequest) { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + AuthAdmin authAdmin = new GetAuthAdminUtil(authAdminService).getAuthAdmin(attributes); + productInfoFilterRequest.setCustomerId(authAdmin.getCustomerId() + ""); + List udiInfoEntities = udiInfoService.filterAllUdiInfo(productInfoFilterRequest); + return ResultVOUtils.success(udiInfoEntities); + } + + @AuthRuleAnnotation("") + @PostMapping("/udi/udirel/update") + public BaseResponse updateRelevanceEntity(@RequestBody UdiInfoEntity udiInfoEntity, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + udiInfoService.updateUdiInfoByUuid(udiInfoEntity); + return ResultVOUtils.success("更新成功"); + } +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/UdiRelevanceController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/UdiRelevanceController.java new file mode 100644 index 0000000..5d3d018 --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/UdiRelevanceController.java @@ -0,0 +1,168 @@ +package com.glxp.udi.admin.controller.inout; + +import com.github.pagehelper.PageInfo; +import com.glxp.udi.admin.annotation.AuthRuleAnnotation; +import com.glxp.udi.admin.entity.auth.AuthAdmin; +import com.glxp.udi.admin.entity.inout.UdiInfoEntity; +import com.glxp.udi.admin.entity.inout.WarehouseEntity; +import com.glxp.udi.admin.exception.JsonException; +import com.glxp.udi.admin.req.inout.DeleteRequest; +import com.glxp.udi.admin.req.inout.FilterUdiInfoRequest; +import com.glxp.udi.admin.req.receipt.CombineRequest; +import com.glxp.udi.admin.res.PageSimpleResponse; +import com.glxp.udi.admin.res.inout.UdiRelevanceResponse; +import com.glxp.udi.admin.service.auth.AuthAdminService; +import com.glxp.udi.admin.service.inout.UdiInfoService; +import com.glxp.udi.admin.service.inout.WarehouseService; +import com.glxp.udi.admin.util.GetAuthAdminUtil; +import com.glxp.udi.common.enums.ResultEnum; +import com.glxp.udi.common.res.BaseResponse; +import com.glxp.udi.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; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; + +@RestController +public class UdiRelevanceController { + + @Value("${UDI_SERVER_URL}") + private String udiUrl; + @Resource + UdiInfoService udiInfoService; + @Resource + WarehouseService warehouseService; + @Resource + AuthAdminService authAdminService; + + //客户端器械信息下载 + @GetMapping("/udi/udirel/download") + public BaseResponse downloadProducts(FilterUdiInfoRequest filterUdiInfoRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + AuthAdmin authAdmin = new GetAuthAdminUtil(authAdminService).getAuthAdmin(attributes); + filterUdiInfoRequest.setCustomerId(authAdmin.getCustomerId() + ""); + + List udiInfoEntities = udiInfoService.filterUdiInfo(filterUdiInfoRequest); + List udiRelevanceResponses = udiInfoEntities.stream().map(e -> { + UdiRelevanceResponse authAdminRoleResponse = new UdiRelevanceResponse(); + BeanUtils.copyProperties(e, authAdminRoleResponse); + return authAdminRoleResponse; + }).collect(Collectors.toList()); + + PageInfo pageInfo; + pageInfo = new PageInfo<>(udiRelevanceResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(udiRelevanceResponses); + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("/udi/udirel/filterUdi") + public BaseResponse filterUdiGp(FilterUdiInfoRequest filterUdiInfoRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + AuthAdmin authAdmin = new GetAuthAdminUtil(authAdminService).getAuthAdmin(attributes); + filterUdiInfoRequest.setCustomerId(authAdmin.getCustomerId() + ""); + + List udiRelevanceResponses = null; + udiRelevanceResponses = udiInfoService.filterUdiInfoGp(filterUdiInfoRequest); + if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) { + for (UdiInfoEntity udiRelevanceResponse : udiRelevanceResponses) { + if (udiRelevanceResponse.getDiType() == 2 && udiRelevanceResponse.getIsUseDy() != 1) { + udiRelevanceResponse.setNameCode(udiRelevanceResponse.getSjcpbm()); + } + } + } + PageInfo pageInfo; + pageInfo = new PageInfo<>(udiRelevanceResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(udiRelevanceResponses); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("/udi/udirel/deleteById") + public BaseResponse deleteById(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + AuthAdmin authAdmin = new GetAuthAdminUtil(authAdminService).getAuthAdmin(attributes); + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String ids = deleteRequest.getId(); + List udiInfoEntities = udiInfoService.findByUuids(ids); + if (udiInfoEntities != null && udiInfoEntities.size() > 0) { + for (int i = 0; i < udiInfoEntities.size(); i++) { + List warehouseEntityList = warehouseService.searchCode(udiInfoEntities.get(i).getNameCode(),authAdmin.getCustomerId()); + if (warehouseEntityList != null && warehouseEntityList.size() > 0) { + return ResultVOUtils.error(500, "改产品已被" + warehouseEntityList.get(0).getOrderId() + "订单关联不能删除"); + } + } + udiInfoService.deleteByUuid(ids); + } + return ResultVOUtils.success("删除成功"); + } + + @AuthRuleAnnotation("") + @PostMapping("/udi/udirel/revleance") + public BaseResponse revleanceUdi(@RequestBody CombineRequest combineRequest) { + + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + AuthAdmin authAdmin = new GetAuthAdminUtil(authAdminService).getAuthAdmin(attributes); + + List keys = combineRequest.getKeys(); + if (keys != null && keys.size() > 0) { + for (String key : keys) { + FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); + filterUdiInfoRequest.setUuid(key); + filterUdiInfoRequest.setCustomerId(authAdmin.getCustomerId()+""); + List udiInfoEntities = udiInfoService.filterAllUdiInfo(filterUdiInfoRequest); + if (udiInfoEntities == null || udiInfoEntities.isEmpty()) { + udiInfoEntities = new UdiDlHttpClient(udiUrl).getUdiByUuid(key); + if (udiInfoEntities != null) { + for (UdiInfoEntity udiInfoEntity : udiInfoEntities) { + udiInfoEntity.setCustomerId(authAdmin.getCustomerId() + ""); + } + udiInfoService.insertUdiInfos(udiInfoEntities); + } else { + return ResultVOUtils.error(500, "连接UDI数据下载服务出错！"); + } + } + } + } + return ResultVOUtils.success("合并成功"); + } + + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/UdiTraceController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/UdiTraceController.java new file mode 100644 index 0000000..b432fba --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/UdiTraceController.java @@ -0,0 +1,149 @@ +package com.glxp.udi.admin.controller.inout; + +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; +import com.github.pagehelper.PageInfo; +import com.glxp.udi.admin.entity.auth.AuthAdmin; +import com.glxp.udi.admin.entity.inout.TraceUploadEntity; +import com.glxp.udi.admin.entity.inout.UdiInfoEntity; +import com.glxp.udi.admin.entity.inout.WarehouseEntity; +import com.glxp.udi.admin.entity.udid.UdiEntity; +import com.glxp.udi.admin.exception.JsonException; +import com.glxp.udi.admin.req.inout.FilterUdiInfoRequest; +import com.glxp.udi.admin.req.inout.WarehouseQueryRequest; +import com.glxp.udi.admin.res.PageSimpleResponse; +import com.glxp.udi.admin.res.inout.UdiRelevanceResponse; +import com.glxp.udi.admin.res.inout.UdiTraceResponse; +import com.glxp.udi.admin.service.auth.AuthAdminService; +import com.glxp.udi.admin.service.inout.UdiInfoService; +import com.glxp.udi.admin.service.inout.UdiRelevanceService; +import com.glxp.udi.admin.service.inout.WarehouseService; +import com.glxp.udi.admin.util.DateUtil; +import com.glxp.udi.admin.util.FilterUdiUtils; +import com.glxp.udi.admin.util.GetAuthAdminUtil; +import com.glxp.udi.admin.util.HttpClient; +import com.glxp.udi.common.enums.ResultEnum; +import com.glxp.udi.common.res.BaseResponse; +import com.glxp.udi.common.util.ResultVOUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; + +@RestController +public class UdiTraceController { + + @Resource + private WarehouseService warehouseService; + @Resource + UdiRelevanceService udiRelevanceService; + @Resource + UdiInfoService udiInfoService; + @Value("${COOR_UPLOAD_ORDER}") + private String coorUploadUrl; + private static final Logger logger = LoggerFactory.getLogger(UdiTraceController.class); + @Resource + AuthAdminService authAdminService; + + @GetMapping("/udiwarehouse/trace/filter") + public BaseResponse list(WarehouseQueryRequest warehouseQueryRequest) { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + AuthAdmin authAdmin = new GetAuthAdminUtil(authAdminService).getAuthAdmin(attributes); + warehouseQueryRequest.setCustomerId(authAdmin.getCustomerId()); + List warehouseEntityList = warehouseService.findByOrderId(warehouseQueryRequest); + if (warehouseEntityList != null && warehouseEntityList.size() > 0) { + WarehouseEntity warehouseEntity = warehouseEntityList.get(0); + UdiEntity udiEntity = FilterUdiUtils.getUdi(warehouseEntity.getCode()); + String udi = udiEntity.getUdi(); + FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); + filterUdiInfoRequest.setNameCode(udi); + + + UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(udi); + List udiTraceResponseList = warehouseEntityList.stream().map(item -> + { + UdiTraceResponse udiTraceResponse = new UdiTraceResponse(); + BeanUtils.copyProperties(item, udiTraceResponse); + if (udiInfoEntity != null) { + udiTraceResponse.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc()); + udiTraceResponse.setCpmctymc(udiInfoEntity.getCpmctymc()); + udiTraceResponse.setGgxh(udiInfoEntity.getGgxh()); + } + return udiTraceResponse; + }).collect(Collectors.toList()); + PageInfo pageInfo; + pageInfo = new PageInfo<>(udiTraceResponseList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(udiTraceResponseList); + return ResultVOUtils.success(pageSimpleResponse); + } else { + return ResultVOUtils.error(500, "未找到该条码！"); + } + } + + @GetMapping("/coor/trace/findCode") + public BaseResponse findCode(WarehouseQueryRequest warehouseQueryRequest) { + List warehouseEntityList = warehouseService.findByOrderId(warehouseQueryRequest); + if (warehouseEntityList != null && warehouseEntityList.size() > 0) { + WarehouseEntity warehouseEntity = warehouseEntityList.get(0); + String udi = warehouseEntity.getCode().substring(2, 16); + FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); + filterUdiInfoRequest.setNameCode(udi); + List udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); + UdiRelevanceResponse udiRelevance = null; + if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) { + udiRelevance = udiRelevanceResponses.get(0); + } + + UdiRelevanceResponse finalUdiRelevance = udiRelevance; + List udiTraceResponseList = warehouseEntityList.stream().map(item -> + { + TraceUploadEntity udiTraceResponse = new TraceUploadEntity(); + udiTraceResponse.setUdiCode(item.getCode()); + udiTraceResponse.setBatchNo(item.getBatchNo()); + udiTraceResponse.setCorpName(item.getFromCorp()); + udiTraceResponse.setCount(item.getCount()); + udiTraceResponse.setCreditNum("9357002"); + try { + udiTraceResponse.setDocumentsDate(DateUtil.timeToStamp(item.getActDate()) + ""); + } catch (Exception e) { + e.printStackTrace(); + } + udiTraceResponse.setDocumentsType(item.getAction()); + udiTraceResponse.setProductionDate(item.getProduceDate()); + udiTraceResponse.setExpireDate(item.getExpireDate()); + BeanUtils.copyProperties(item, udiTraceResponse); + if (finalUdiRelevance != null) { + udiTraceResponse.setProductionCorp(finalUdiRelevance.getYlqxzcrbarmc()); + udiTraceResponse.setProductName(finalUdiRelevance.getCpmctymc()); + udiTraceResponse.setSpecifications(finalUdiRelevance.getGgxh()); + } + return udiTraceResponse; + }).collect(Collectors.toList()); + if (udiTraceResponseList != null && udiTraceResponseList.size() > 0) { + for (TraceUploadEntity traceUploadEntity : udiTraceResponseList) { + String response = HttpClient.uCloudPost(coorUploadUrl, traceUploadEntity); + logger.info(response); + BaseResponse baseResponse = + JSONObject.parseObject(response, new TypeReference() { + }); + } + } + return ResultVOUtils.success("查询成功，等待上传"); + } else { + return ResultVOUtils.error(500, "未找到该条码！"); + } + } +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/UnitController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/UnitController.java deleted file mode 100644 index a296672..0000000 --- a/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/UnitController.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.glxp.udi.admin.controller.inout; - -import com.github.pagehelper.PageInfo; -import com.glxp.udi.admin.entity.inout.Unit; -import com.glxp.udi.admin.req.ListPageRequest; -import com.glxp.udi.admin.req.inout.UnitKeyRequest; -import com.glxp.udi.admin.req.inout.UnitSaveRequest; -import com.glxp.udi.admin.res.PageSimpleResponse; -import com.glxp.udi.admin.service.inout.UnitService; -import com.glxp.udi.common.enums.ResultEnum; -import com.glxp.udi.common.res.BaseResponse; -import com.glxp.udi.common.util.ResultVOUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import javax.validation.Valid; -import java.util.List; - -@RestController -public class UnitController { - - @Resource - UnitService unitService; - - - @GetMapping("warehouse/unit/list") - public BaseResponse listUnits(@Valid ListPageRequest listPageRequest, BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - - List units = unitService.listUnit(listPageRequest); - PageInfo pageInfo = new PageInfo<>(units); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(units); - return ResultVOUtils.success(pageSimpleResponse); - } - - @GetMapping("warehouse/unit/list/key") - public BaseResponse listUnitsByKey(@Valid UnitKeyRequest keyRequest, BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - - List units = unitService.listUnitKey(keyRequest); - PageInfo pageInfo = new PageInfo<>(units); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(units); - return ResultVOUtils.success(pageSimpleResponse); - } - - @PostMapping("/warehouse/unit/save") - public BaseResponse saveList(@RequestBody @Valid UnitSaveRequest unitSaveRequest, BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - unitService.deletAll(); - int b = unitService.saveUnits(unitSaveRequest); - System.out.println(b + "-------------------"); - if (b < 0) { - return ResultVOUtils.error(ResultEnum.NOT_NETWORK); - } - - return ResultVOUtils.success("添加成功"); - } -} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/UnitMaintainController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/UnitMaintainController.java new file mode 100644 index 0000000..07f9539 --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/UnitMaintainController.java @@ -0,0 +1,138 @@ +package com.glxp.udi.admin.controller.inout; + +import com.github.pagehelper.PageInfo; +import com.glxp.udi.admin.annotation.AuthRuleAnnotation; +import com.glxp.udi.admin.entity.auth.AuthAdmin; +import com.glxp.udi.admin.entity.inout.UnitMaintainEntity; +import com.glxp.udi.admin.exception.JsonException; +import com.glxp.udi.admin.req.inout.DeleteRequest; +import com.glxp.udi.admin.req.inout.UnitMaintainFilterRequest; +import com.glxp.udi.admin.res.PageSimpleResponse; +import com.glxp.udi.admin.service.auth.AuthAdminService; +import com.glxp.udi.admin.service.inout.UnitMaintainService; +import com.glxp.udi.admin.util.GetAuthAdminUtil; +import com.glxp.udi.common.enums.ResultEnum; +import com.glxp.udi.common.res.BaseResponse; +import com.glxp.udi.common.util.ResultVOUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 往来单位信息维护 + */ +@RestController +public class UnitMaintainController { + + @Resource + private UnitMaintainService unitMaintainService; + @Resource + AuthAdminService authAdminService; + + @GetMapping("/warehouse/unitMaintain/filter") + public BaseResponse filterUnitMaintain(UnitMaintainFilterRequest unitMaintainFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + AuthAdmin authAdmin = new GetAuthAdminUtil(authAdminService).getAuthAdmin(attributes); + unitMaintainFilterRequest.setCustomerId(authAdmin.getCustomerId() + ""); + + List unitMaintainEntities; + unitMaintainEntities = unitMaintainService.filterList(unitMaintainFilterRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(unitMaintainEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(unitMaintainEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @AuthRuleAnnotation("") + @GetMapping("/warehouse/unit/download") + public BaseResponse downloadUnit(UnitMaintainFilterRequest unitMaintainFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + AuthAdmin authAdmin = new GetAuthAdminUtil(authAdminService).getAuthAdmin(attributes); + unitMaintainFilterRequest.setCustomerId(authAdmin.getCustomerId() + ""); + + List unitMaintainEntities; + unitMaintainEntities = unitMaintainService.filterList(unitMaintainFilterRequest); + + PageInfo pageInfo; + pageInfo = new PageInfo<>(unitMaintainEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(unitMaintainEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("/warehouse/unitMaintain/add") + public BaseResponse addUnitMaintain(@RequestBody UnitMaintainEntity unitMaintainEntity, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + AuthAdmin authAdmin = new GetAuthAdminUtil(authAdminService).getAuthAdmin(attributes); + unitMaintainEntity.setCustomerId(authAdmin.getCustomerId() + ""); + unitMaintainService.insertUnitMaintain(unitMaintainEntity); + return ResultVOUtils.success("添加成功"); + } + + + @PostMapping("/warehouse/unitMaintain/modify") + public BaseResponse modifyUnitMaintain(@RequestBody UnitMaintainEntity unitMaintainEntity, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } +// +// ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); +// if (attributes == null) { +// throw new JsonException(ResultEnum.NOT_NETWORK); +// } +// AuthAdmin authAdmin = new GetAuthAdminUtil(authAdminService).getAuthAdmin(attributes); +// unitMaintainEntity.setCustomerId(authAdmin.getCustomerId() + ""); + unitMaintainService.updateUnit(unitMaintainEntity); + return ResultVOUtils.success("添加成功"); + } + + @PostMapping("/warehouse/unitMaintain/delete") + public BaseResponse deleteUnitMaintain(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + + unitMaintainService.deleteById(id); + + return ResultVOUtils.success("删除成功"); + } +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/WareHouseController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/WareHouseController.java index 8954716..bbf4179 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/WareHouseController.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/WareHouseController.java @@ -2,27 +2,33 @@ package com.glxp.udi.admin.controller.inout; import com.github.pagehelper.PageInfo; import com.glxp.udi.admin.annotation.AuthRuleAnnotation; -import com.glxp.udi.admin.constant.TypeConstant; -import com.glxp.udi.admin.entity.inout.*; +import com.glxp.udi.admin.entity.auth.AuthAdmin; +import com.glxp.udi.admin.entity.inout.ErpOrderEntity; +import com.glxp.udi.admin.entity.inout.WarehouseEntity; +import com.glxp.udi.admin.entity.inout.Warehousetemp; import com.glxp.udi.admin.exception.JsonException; import com.glxp.udi.admin.req.inout.*; import com.glxp.udi.admin.res.PageSimpleResponse; import com.glxp.udi.admin.res.inout.WarehouseResponse; -import com.glxp.udi.admin.service.inout.OrderService; -import com.glxp.udi.admin.service.inout.WarehouseService; -import com.glxp.udi.admin.util.FastJsonUtils; +import com.glxp.udi.admin.service.auth.AuthAdminService; +import com.glxp.udi.admin.service.info.SetupService; +import com.glxp.udi.admin.service.inout.*; +import com.glxp.udi.admin.thread.TransInoutService; +import com.glxp.udi.admin.util.GetAuthAdminUtil; import com.glxp.udi.admin.util.WarehousBeanUtils; import com.glxp.udi.common.enums.ResultEnum; import com.glxp.udi.common.res.BaseResponse; import com.glxp.udi.common.util.ResultVOUtils; import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +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 org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; import java.util.ArrayList; import java.util.List; @@ -34,8 +40,47 @@ public class WareHouseController { private WarehouseService warehouseService; @Resource private OrderService orderService; + @Resource + private MyErpOrderService myErpOrderService; + @Resource + private TransInoutService transInoutService; + @Resource + private UdiInfoService udiInfoService; + @Resource + private UdiRelevanceService udiRelevanceService; + @Resource + private SetupService setupService; + @Resource + AuthAdminService authAdminService; + + @AuthRuleAnnotation("") + @PostMapping("warehouse/inout/postOrders") + public BaseResponse postOrders(@RequestBody PostOrderRequest postOrderRequest, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + AuthAdmin authAdmin = new GetAuthAdminUtil(authAdminService).getAuthAdmin(attributes); + try { + transInoutService.transInout(postOrderRequest, authAdmin.getCustomerId()); + } catch (Exception e) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } - @GetMapping("salewarehouse/inout/list") + return ResultVOUtils.success("导入成功"); + } + + + /** + * -----------------------暂不确定---------------------- + */ + + + @AuthRuleAnnotation("") + @GetMapping("admin/warehouse/inout/list") public BaseResponse list(WarehouseQueryRequest warehouseQueryRequest) { List warehouseEntityList = warehouseService.listWarehouse(warehouseQueryRequest); List warehouseResponses = warehouseEntityList.stream().map(item -> @@ -69,7 +114,7 @@ public class WareHouseController { } - @GetMapping("salewarehouse/inout/findByNo") + @GetMapping("admin/warehouse/inout/findByNo") public BaseResponse findByNo(WarehouseQueryRequest warehouseQueryRequest) { List warehouseEntityList = warehouseService.findByNo(warehouseQueryRequest); List warehouseResponses = warehouseEntityList.stream().map(item -> @@ -86,7 +131,7 @@ public class WareHouseController { return ResultVOUtils.success(pageSimpleResponse); } - @GetMapping("salewarehouse/inout/findByOrderId") + @GetMapping("admin/warehouse/inout/findByOrderId") public BaseResponse findByOrderId(WarehouseQueryRequest warehouseQueryRequest) { List warehouseEntityList = warehouseService.findByOrderId(warehouseQueryRequest); List warehouseResponses = warehouseEntityList.stream().map(item -> @@ -103,221 +148,53 @@ public class WareHouseController { return ResultVOUtils.success(pageSimpleResponse); } - @GetMapping("salewarehouse/inout/findErrorByOrderId") - public BaseResponse findErrorByOrderId(WarehouseQueryRequest warehouseQueryRequest) { - List warehousetempList = warehouseService.findErrorByOrderId(warehouseQueryRequest); - List warehouseResponses = WarehousBeanUtils.tempsToWarehouseResponse(warehousetempList); - PageInfo pageInfo; - pageInfo = new PageInfo<>(warehousetempList); + @GetMapping("admin/warehouse/inout/findAllByOrderId") + public BaseResponse findAllByOrderId(WarehouseQueryRequest warehouseQueryRequest) { + List warehouseEntityList = warehouseService.findAllByOrderId(warehouseQueryRequest); + List warehouseResponses = warehouseEntityList.stream().map(item -> + { + WarehouseResponse warehouseResponse = new WarehouseResponse(); + BeanUtils.copyProperties(item, warehouseResponse); + return warehouseResponse; + }).collect(Collectors.toList()); + PageInfo pageInfo; + pageInfo = new PageInfo<>(warehouseEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(warehouseResponses); return ResultVOUtils.success(pageSimpleResponse); } - @PostMapping("/salewarehouse/inout/adList") - public BaseResponse adList(@RequestParam("warehouseEntities") String warehouseEntities) { - try { - List warehouseEntityList = FastJsonUtils.getJsonToList(warehouseEntities, WarehouseEntity.class); - List orders = new ArrayList<>(); - List warehousetempList = new WarehousBeanUtils().entityToTemp(warehouseEntityList); - new Thread(() -> { - String id = null; - List> orderList = new ArrayList<>(); - List orderOne = null; - if (warehousetempList != null && warehousetempList.size() > 0) { - for (int i = 0; i < warehousetempList.size(); i++) { - WarehousetempEntity warehouseEntity = warehousetempList.get(i); - if (!orders.contains(warehouseEntity.getCorpOrderId())) { - orderOne = new ArrayList<>(); - orderList.add(orderOne); - orders.add(warehouseEntity.getCorpOrderId()); - id = System.currentTimeMillis() + i + ""; - OrderEntity orderSaveRequest = new OrderEntity(); - orderSaveRequest.setId(id); - if (warehouseEntity.getActDate() != null) { - orderSaveRequest.setActDate(warehouseEntity.getActDate()); - } - - orderSaveRequest.setAction(warehouseEntity.getAction()); - orderSaveRequest.setActor(warehouseEntity.getActor()); - orderSaveRequest.setCorpOrderId(warehouseEntity.getCorpOrderId()); - orderSaveRequest.setFromCorpId(warehouseEntity.getFromCorpID()); - orderSaveRequest.setMainAction(warehouseEntity.getMainAction()); - orderSaveRequest.setFromCorp(warehouseEntity.getFromCorp()); - orderSaveRequest.setStatus("error"); - orderSaveRequest.setExportStatus("未导出"); - orderService.insertOrder(orderSaveRequest); - } - warehouseEntity.setOrderId(id); - warehousetempList.get(i).setOrderId(id); - orderOne.add(warehouseEntity); - } - } - boolean b = warehouseService.insertTempWarehouses(warehousetempList); - - for (int i = 0; i < orderList.size(); i++) { - List filterList = orderList.get(i); - List insertList = new ArrayList<>(); - String result; - for (int j = 0; j < filterList.size(); j++) { - WarehousetempEntity warehousetemp = filterList.get(j); - result = filterCode(warehousetemp); - if (result == null) { - insertList.add(warehousetemp); - - } else { - orderService.updateRemark(warehousetemp.getOrderId(), result); - insertList.clear(); - break; - } - } - if (insertList.size() > 0) { - warehouseService.insertWarehouses(new WarehousBeanUtils().tempsToEntitys(insertList)); - WarehousetempEntity warehousetemp = insertList.get(0); - CommitRequest commitRequest = new CommitRequest(); - commitRequest.setOrderId(warehousetemp.getOrderId()); - List warehousetemps = warehouseService.findTempByOrderId(commitRequest); - orderService.updateOrderStatus(insertList.get(0).getOrderId(), "success"); - List ids = new ArrayList<>(); - for (WarehousetempEntity w : warehousetemps) { - ids.add(w.getId()); - } - warehouseService.deleteTempWarehouses(ids); - insertList.clear(); - } - - } - - }).start(); - - } catch (Exception e) { - return ResultVOUtils.error(ResultEnum.NOT_NETWORK); - } - - return ResultVOUtils.success("添加成功"); + @GetMapping("admin/warehouse/inout/findErrorByOrderId") + public BaseResponse findErrorByOrderId(WarehouseQueryRequest warehouseQueryRequest) { + List warehousetempList = warehouseService.findErrorByOrderId(warehouseQueryRequest); + List warehouseResponses = WarehousBeanUtils.tempsToWarehouseResponse(warehousetempList); + PageInfo pageInfo; + pageInfo = new PageInfo<>(warehousetempList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(warehouseResponses); + return ResultVOUtils.success(pageSimpleResponse); } - public String filterCode(WarehousetempEntity warehousetemp) { - List warehouseEntityList = warehouseService.findByCode(warehousetemp.getCode()); - WarehouseEntity warehouseData = new WarehouseEntity(); - BeanUtils.copyProperties(warehousetemp, warehouseData); - if (warehouseEntityList == null || warehouseEntityList.size() == 0) { //数据库为null,可以添加 - return null; - } - List inList = new ArrayList<>(); - List outList = new ArrayList<>(); - if (warehouseEntityList != null && warehouseEntityList.size() > 0) { - for (int i = 0; i < warehouseEntityList.size(); i++) { - WarehouseEntity temp = warehouseEntityList.get(i); - if (temp.getAction().equals(TypeConstant.TYPE_CODE_DESTORY)) { //过滤已销毁的 - return "该码无效"; + public void updateErpOrderId(List erpOrderEntities, String oldId, String newId) { + if (erpOrderEntities != null) { + List inserts = new ArrayList<>(); + for (ErpOrderEntity erpOrderEntity : erpOrderEntities) { + if (erpOrderEntity.getOrderIdFk().equals(oldId)) { + erpOrderEntity.setOrderIdFk(newId); + inserts.add(erpOrderEntity); } - if (temp.getMainAction().equals(TypeConstant.TYPE_OUT)) { - outList.add(temp); - } else if (temp.getMainAction().equals(TypeConstant.TYPE_PUT)) { - inList.add(temp); - } - } - //如果数据库存在1个出库，则可以再录入1个入库;（同理：存在4个出库，3个入库，则可以再录入1个入库） - if (outList.size() - inList.size() == 1) { - if (warehouseData.getMainAction().equals(TypeConstant.TYPE_PUT)) { -// warehouseService.insertWarehouse(warehouseData); - WarehouseEntity out = outList.get(outList.size() - 1); - if (warehousetemp.getAction().equals(TypeConstant.TYPE_PUT_RETURN)) { - if (out.getAction().equals(TypeConstant.TYPE_OUT_SALE) || out.getAction().equals(TypeConstant.TYPE_OUT_STRAIGHT) || out.getAction().equals(TypeConstant.TYPE_OUT_CHECK)) { - return null; - } else { - return "退货入库失败"; - } - } - if (warehousetemp.getAction().equals(TypeConstant.TYPE_PUT_PRODUCT)) { - if (out.getAction().equals(TypeConstant.TYPE_OUT_REWORK)) { - return null; - } else { - return "生产入库失败"; - } - } - if (warehousetemp.getAction().equals(TypeConstant.TYPE_PUT_PURCHASE)) { - if (out.getAction().equals(TypeConstant.TYPE_OUT_RETURN)) { - return null; - } else { - return "采购入库失败"; - } - } - if (warehousetemp.getAction().equals(TypeConstant.TYPE_PUT_ALLOT)) { - if (out.getAction().equals(TypeConstant.TYPE_OUT_ALLOT)) { - return null; - } else { - return "调拨入库失败"; - } - } - return null; - } - } else if (inList.size() - outList.size() == 1) { - if (warehouseData.getMainAction().equals(TypeConstant.TYPE_OUT)) { - WarehouseEntity in = inList.get(inList.size() - 1); - if (warehousetemp.getAction().equals(TypeConstant.TYPE_OUT_REWORK)) { - if (in.getAction().equals(TypeConstant.TYPE_PUT_PRODUCT)) { - return null; - } else { - return "返工出库失败"; - } - } - if (warehousetemp.getAction().equals(TypeConstant.TYPE_OUT_RETURN)) { - if (in.getAction().equals(TypeConstant.TYPE_PUT_PURCHASE)) { - return null; - } else { - return "退货出库失败"; - } - } - if (warehousetemp.getAction().equals(TypeConstant.TYPE_OUT_ALLOT)) { - if (in.getAction().equals(TypeConstant.TYPE_PUT_ALLOT)) { - return null; - } else { - return "调拨出库失败"; - } - } - if (warehousetemp.getAction().equals(TypeConstant.TYPE_OUT_SALE)) { - if (in.getAction().equals(TypeConstant.TYPE_PUT_RETURN)) { - return null; - } else { - return "调拨出库失败"; - } - } - if (warehousetemp.getAction().equals(TypeConstant.TYPE_OUT_CHECK)) { - if (in.getAction().equals(TypeConstant.TYPE_PUT_RETURN)) { - return null; - } else { - return "调拨出库失败"; - } - } - if (warehousetemp.getAction().equals(TypeConstant.TYPE_OUT_STRAIGHT)) { - if (in.getAction().equals(TypeConstant.TYPE_PUT_RETURN)) { - return null; - } else { - return "调拨出库失败"; - } - } - return null; - } - - - } else if (inList.size() - outList.size() == 0) { -// warehouseService.insertWarehouse(warehouseData); - return null; - } else { - return "该码已存在"; } - return "该码已存在"; + myErpOrderService.insertErpOrders(inserts); } - return null; + } - @PostMapping("/salewarehouse/inout/save") + @PostMapping("/admin/warehouse/inout/save") public BaseResponse save(@RequestBody @Valid WarehouseSaveRequest warehouseSaveRequest, BindingResult bindingResult) { @@ -335,162 +212,16 @@ public class WareHouseController { return ResultVOUtils.success("添加成功"); } - @PostMapping("/salewarehouse/inout/commit") + @AuthRuleAnnotation("") + @PostMapping("/warehouse/inout/commit") public BaseResponse commitOrder(@RequestBody CommitRequest commitRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - List warehousetempList = warehouseService.findTempByOrderId(commitRequest); - if (warehousetempList != null && warehousetempList.size() > 0) { - String result; - List insertList = new ArrayList<>(); - for (int j = 0; j < warehousetempList.size(); j++) { - WarehousetempEntity warehousetemp = warehousetempList.get(j); - result = filterCode(warehousetemp); - if (result == null) { - insertList.add(warehousetemp); - - } else { - orderService.updateRemark(warehousetemp.getOrderId(), result); - insertList.clear(); - return ResultVOUtils.error(302, result); - } - } - if (insertList.size() > 0) { - warehouseService.insertWarehouses(new WarehousBeanUtils().tempsToEntitys(insertList)); - orderService.updateOrderStatus(insertList.get(0).getOrderId(), "success"); - List ids = new ArrayList<>(); - for (WarehousetempEntity warehousetemp : insertList) { - ids.add(warehousetemp.getId()); - } - warehouseService.deleteTempWarehouses(ids); - - } - } else { - return ResultVOUtils.error(301, "条码为null"); - } + transInoutService.repeatCommit(commitRequest); return ResultVOUtils.success("提交成功"); } - - //客户端扫码添加 - @AuthRuleAnnotation("") - @PostMapping("/salewarehouse/inout/addScan") - public BaseResponse addScan(@RequestBody AddScanRequest addScanRequest, BindingResult bindingResult) { - ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - if (attributes == null) { - throw new JsonException(ResultEnum.NOT_NETWORK); - } - HttpServletRequest request = attributes.getRequest(); - String userId = request.getHeader("ADMIN_ID"); - List warehousetempList = new ArrayList<>(); - List addScanBeans = addScanRequest.getScanDatas(); - if (addScanBeans != null && addScanBeans.size() > 0) { - for (int i = 0; i < addScanBeans.size(); i++) { - List addScanCodeBeans = addScanBeans.get(i).getCodes(); - if(addScanCodeBeans!=null && addScanCodeBeans.size()>0){ - for(int j = 0;j 3 && addScanBean.getAction().substring(size - 2, size).equals("In")) { - warehousetempEntity.setMainAction("WareHouseIn"); - } else { - warehousetempEntity.setMainAction("WareHouseOut"); - } - warehousetempEntity.setActor(userId); - warehousetempList.add(warehousetempEntity); - } - } - - - - } - - - List orders = new ArrayList<>(); - new Thread(() -> { - String id = null; - List> orderList = new ArrayList<>(); - List orderOne = null; - if (warehousetempList != null && warehousetempList.size() > 0) { - for (int i = 0; i < warehousetempList.size(); i++) { - WarehousetempEntity warehouseEntity = warehousetempList.get(i); - if (!orders.contains(warehouseEntity.getCorpOrderId())) { - orderOne = new ArrayList<>(); - orderList.add(orderOne); - orders.add(warehouseEntity.getCorpOrderId()); - id = System.currentTimeMillis() + i + ""; - OrderEntity orderSaveRequest = new OrderEntity(); - orderSaveRequest.setId(id); - if (warehouseEntity.getActDate() != null) { - orderSaveRequest.setActDate(warehouseEntity.getActDate()); - } - - orderSaveRequest.setAction(warehouseEntity.getAction()); - orderSaveRequest.setActor(warehouseEntity.getActor()); - orderSaveRequest.setCorpOrderId(warehouseEntity.getCorpOrderId()); - orderSaveRequest.setFromCorpId(warehouseEntity.getFromCorpID()); - orderSaveRequest.setMainAction(warehouseEntity.getMainAction()); - orderSaveRequest.setFromCorp(warehouseEntity.getFromCorp()); - orderSaveRequest.setStatus("error"); - orderSaveRequest.setExportStatus("未导出"); - orderService.insertOrder(orderSaveRequest); - } - - warehouseEntity.setOrderId(id); - warehousetempList.get(i).setOrderId(id); - orderOne.add(warehouseEntity); - } - } - boolean b = warehouseService.insertTempWarehouses(warehousetempList); - - for (int i = 0; i < orderList.size(); i++) { - List filterList = orderList.get(i); - List insertList = new ArrayList<>(); - String result; - for (int j = 0; j < filterList.size(); j++) { - WarehousetempEntity warehousetemp = filterList.get(j); - result = filterCode(warehousetemp); - if (result == null) { - insertList.add(warehousetemp); - - } else { - orderService.updateRemark(warehousetemp.getOrderId(), result); - insertList.clear(); - break; - } - } - if (insertList.size() > 0) { - warehouseService.insertWarehouses(new WarehousBeanUtils().tempsToEntitys(insertList)); - WarehousetempEntity warehousetemp = insertList.get(0); - CommitRequest commitRequest = new CommitRequest(); - commitRequest.setOrderId(warehousetemp.getOrderId()); - List warehousetemps = warehouseService.findTempByOrderId(commitRequest); - orderService.updateOrderStatus(insertList.get(0).getOrderId(), "success"); - List ids = new ArrayList<>(); - for (WarehousetempEntity w : warehousetemps) { - ids.add(w.getId()); - } - warehouseService.deleteTempWarehouses(ids); - insertList.clear(); - } - - } - - }).start(); - } else { - return ResultVOUtils.error(301, "上传条码为空"); - } - return ResultVOUtils.success("添加成功"); - } - } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/WhitecodeController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/WhitecodeController.java deleted file mode 100644 index 3f9f6ef..0000000 --- a/api-udims/src/main/java/com/glxp/udi/admin/controller/inout/WhitecodeController.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.glxp.udi.admin.controller.inout; - -import com.github.pagehelper.PageInfo; -import com.glxp.udi.admin.annotation.AuthRuleAnnotation; -import com.glxp.udi.admin.entity.contrast.WhitecodeEntity; -import com.glxp.udi.admin.exception.JsonException; -import com.glxp.udi.admin.req.ListPageRequest; -import com.glxp.udi.admin.res.PageSimpleResponse; -import com.glxp.udi.admin.res.contrast.WhitecodeResponse; -import com.glxp.udi.admin.service.contrast.WhitecodeService; -import com.glxp.udi.common.enums.ResultEnum; -import com.glxp.udi.common.res.BaseResponse; -import com.glxp.udi.common.util.ResultVOUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; -import java.util.List; -import java.util.stream.Collectors; - -@RestController -public class WhitecodeController { - @Resource - WhitecodeService whitecodeService; - - //白名单下载 - @AuthRuleAnnotation("") - @GetMapping("/salewarehouse/whitecode/list") - public BaseResponse listWhitecode(@Valid ListPageRequest listPageRequest, BindingResult bindingResult) { - - ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - if (attributes == null) { - throw new JsonException(ResultEnum.NOT_NETWORK); - } - HttpServletRequest request = attributes.getRequest(); - String userId = request.getHeader("ADMIN_ID"); -// AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); - List whitecodeEntities = whitecodeService.findAll(listPageRequest); - List whitecodeResponses = whitecodeEntities.stream().map(item -> - { - WhitecodeResponse whitecodeResponse = new WhitecodeResponse(); - BeanUtils.copyProperties(item, whitecodeResponse); - return whitecodeResponse; - }).collect(Collectors.toList()); - - PageInfo pageInfo = new PageInfo<>(whitecodeResponses); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(whitecodeResponses); - return ResultVOUtils.success(pageSimpleResponse); - - } - -} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/publish/PostIdentifyController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/publish/PostIdentifyController.java index 97d9cf7..e4380bf 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/controller/publish/PostIdentifyController.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/controller/publish/PostIdentifyController.java @@ -222,8 +222,16 @@ public class PostIdentifyController { dataSetBean.setTSCCHCZTJ(udiDeviceIdResponse.getSpecialText()); dataSetBean.setTSCCSM(udiDeviceIdResponse.getClinicalSizeText()); - dataSetBean.setSCBSSFBHPH(udiDeviceIdResponse.getIsLotBatch()); - dataSetBean.setSCBSSFBHXLH(udiDeviceIdResponse.getIsSerialNumber()); +// dataSetBean.setSCBSSFBHPH(udiDeviceIdResponse.getIsLotBatch()); + + if (udiDeviceIdResponse.getIsLotBatch() != null && udiDeviceIdResponse.getIsLotBatch().equals("2")) + dataSetBean.setSCBSSFBHPH("0"); + else dataSetBean.setSCBSSFBHPH("1"); + + if (udiDeviceIdResponse.getIsSerialNumber() != null && udiDeviceIdResponse.getIsSerialNumber().equals("2")) + dataSetBean.setSCBSSFBHXLH("0"); + else dataSetBean.setSCBSSFBHXLH("1"); +// dataSetBean.setSCBSSFBHXLH(udiDeviceIdResponse.getIsSerialNumber()); dataSetBean.setSCBSSFBHSCRQ(udiDeviceIdResponse.getIsManufacturingDate()); if (udiDeviceIdResponse.getIsExpirationDate() != null && udiDeviceIdResponse.getIsExpirationDate().equals("2")) dataSetBean.setSCBSSFBHSXRQ("0"); diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/publish/SubUdiProductController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/publish/SubUdiProductController.java index fafcbb5..b67c0e6 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/controller/publish/SubUdiProductController.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/controller/publish/SubUdiProductController.java @@ -71,7 +71,7 @@ public class SubUdiProductController { if (udiSubProductEntity != null) { if (udiSubProductEntity.getSPTM() != null && udiSubProductEntity.getSPTM().length() == 13) { - if (identifierService.isUsedIdentifyCode(udiSubProductEntity.getSPTM(). + if (identifierService.isSptmUsed(udiSubProductEntity.getSPTM(). substring(0, udiSubProductEntity.getSPTM().length() - 1))) { return ResultVOUtils.error(500, "商品条码已被使用"); } @@ -133,7 +133,7 @@ public class SubUdiProductController { if (udiSubProductEntity != null) { if (udiSubProductEntity.getSPTM() != null && udiSubProductEntity.getSPTM().length() == 13 && !temp.getSPTM().equals(udiSubProductEntity.getSPTM())) { - if (identifierService.isUsedIdentifyCode(udiSubProductEntity.getSPTM(). + if (identifierService.isSptmUsed(udiSubProductEntity.getSPTM(). substring(0, udiSubProductEntity.getSPTM().length() - 1))) { return ResultVOUtils.error(500, "商品条码已被使用"); } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/publish/UdiDeviceIdController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/publish/UdiDeviceIdController.java index 96488c5..5da85e5 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/controller/publish/UdiDeviceIdController.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/controller/publish/UdiDeviceIdController.java @@ -73,27 +73,27 @@ public class UdiDeviceIdController { if (udiDeviceIdEntity != null) { if (udiDeviceIdEntity.getPrimaryDeviceId() != null && udiDeviceIdEntity.getPrimaryDeviceId().length() > 10) { - if (identifierService.isUsedIdentifyCode(udiDeviceIdEntity.getPrimaryDeviceId(). + if (identifierService.isUdiUsed(udiDeviceIdEntity.getPrimaryDeviceId(). substring(1, udiDeviceIdEntity.getPrimaryDeviceId().length() - 1))) { return ResultVOUtils.error(500, "最小销售单元产品标识条码已被使用"); } } if (udiDeviceIdEntity.getDirectMarkDI() != null && udiDeviceIdEntity.getDirectMarkDI().length() > 10) { - if (identifierService.isUsedIdentifyCode(udiDeviceIdEntity.getDirectMarkDI(). + if (identifierService.isUdiUsed(udiDeviceIdEntity.getDirectMarkDI(). substring(1, udiDeviceIdEntity.getDirectMarkDI().length() - 1))) { return ResultVOUtils.error(500, "本体产品标识条码已被使用"); } } if (udiDeviceIdEntity.getUseUnitDeviceId() != null && udiDeviceIdEntity.getUseUnitDeviceId().length() > 10) { - if (identifierService.isUsedIdentifyCode(udiDeviceIdEntity.getUseUnitDeviceId(). + if (identifierService.isUdiUsed(udiDeviceIdEntity.getUseUnitDeviceId(). substring(1, udiDeviceIdEntity.getUseUnitDeviceId().length() - 1))) { return ResultVOUtils.error(500, "使用单元产品标识条码已被使用"); } } if (udiDevicepkEntities != null && udiDevicepkEntities.size() > 0) { for (UdiDevicepkEntity udiDevicepkEntity : udiDevicepkEntities) { - if (identifierService.isUsedIdentifyCode(udiDevicepkEntity.getPkgDeviceId(). + if (identifierService.isUdiUsed(udiDevicepkEntity.getPkgDeviceId(). substring(1, udiDevicepkEntity.getPkgDeviceId().length() - 1))) { return ResultVOUtils.error(500, "包装产品标识条码已被使用"); } @@ -199,20 +199,20 @@ public class UdiDeviceIdController { udiDeviceIdEntity.setSYS_CreatedBy(DateUtil.getDateTime()); UdiDeviceIdEntity temp = udiDeviceIdService.selectById(udiDeviceIdEntity.getUDI_DeviceIdOID()); if (udiDeviceIdEntity.getPrimaryDeviceId() != null && udiDeviceIdEntity.getPrimaryDeviceId().length() > 13 && !udiDeviceIdEntity.getPrimaryDeviceId().equals(temp.getPrimaryDeviceId())) { - if (identifierService.isUsedIdentifyCode(udiDeviceIdEntity.getPrimaryDeviceId(). + if (identifierService.isUdiUsed(udiDeviceIdEntity.getPrimaryDeviceId(). substring(1, udiDeviceIdEntity.getPrimaryDeviceId().length() - 1))) { return ResultVOUtils.error(500, "最小销售单元产品标识条码已被使用"); } } if (udiDeviceIdEntity.getDirectMarkDI() != null && udiDeviceIdEntity.getDirectMarkDI().length() > 13 && !udiDeviceIdEntity.getPrimaryDeviceId().equals(temp.getPrimaryDeviceId())) { - if (identifierService.isUsedIdentifyCode(udiDeviceIdEntity.getDirectMarkDI(). + if (identifierService.isUdiUsed(udiDeviceIdEntity.getDirectMarkDI(). substring(1, udiDeviceIdEntity.getDirectMarkDI().length() - 1))) { return ResultVOUtils.error(500, "本体产品标识条码已被使用"); } } if (udiDeviceIdEntity.getUseUnitDeviceId() != null && udiDeviceIdEntity.getUseUnitDeviceId().length() > 13 && !udiDeviceIdEntity.getPrimaryDeviceId().equals(temp.getPrimaryDeviceId())) { - if (identifierService.isUsedIdentifyCode(udiDeviceIdEntity.getUseUnitDeviceId(). + if (identifierService.isUdiUsed(udiDeviceIdEntity.getUseUnitDeviceId(). substring(1, udiDeviceIdEntity.getUseUnitDeviceId().length() - 1))) { return ResultVOUtils.error(500, "使用单元产品标识条码已被使用"); } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/receipts/BussinessTypeController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/receipts/BussinessTypeController.java deleted file mode 100644 index 34dab77..0000000 --- a/api-udims/src/main/java/com/glxp/udi/admin/controller/receipts/BussinessTypeController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.glxp.udi.admin.controller.receipts; - -import com.github.pagehelper.PageInfo; -import com.glxp.udi.admin.constant.BussinessTypeUtils; -import com.glxp.udi.admin.entity.receipt.BussinessTypeEntity; -import com.glxp.udi.admin.req.inout.DeleteRequest; -import com.glxp.udi.admin.req.receipt.BussinessTypeFilterRequest; -import com.glxp.udi.admin.res.PageSimpleResponse; -import com.glxp.udi.admin.service.receipts.BussinessTypeService; -import com.glxp.udi.common.enums.ResultEnum; -import com.glxp.udi.common.res.BaseResponse; -import com.glxp.udi.common.util.ResultVOUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Map; - -/** - * 业务类型维护 - */ - -@RestController -public class BussinessTypeController { - - - @Resource - private BussinessTypeService bussinessTypeService; - - - @GetMapping("/warehouse/bussinessType/filter") - public BaseResponse filterBussinessType(BussinessTypeFilterRequest bussinessTypeFilterRequest, - BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - List bussinessTypeEntities; - - Map data = BussinessTypeUtils.getBusssinessTypeMap(); - String type = data.getOrDefault(bussinessTypeFilterRequest.getUdiwmsType(), bussinessTypeFilterRequest.getUdiwmsType()); - bussinessTypeFilterRequest.setUdiwmsType(type); - bussinessTypeEntities = bussinessTypeService.filterList(bussinessTypeFilterRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(bussinessTypeEntities); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(bussinessTypeEntities); - return ResultVOUtils.success(pageSimpleResponse); - } - - @PostMapping("/warehouse/bussinessType/delete") - public BaseResponse deleteBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - String id = deleteRequest.getId(); - bussinessTypeService.deleteById(id); - return ResultVOUtils.success("删除成功"); - } - - @PostMapping("/warehouse/bussinessType/update") - public BaseResponse updateBussinessType(@RequestBody BussinessTypeEntity bussinessTypeEntity, - BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - if (bussinessTypeEntity != null) { - bussinessTypeService.updateBussinessType(bussinessTypeEntity); - } else { - ResultVOUtils.error(999, "参数错误"); - } - return ResultVOUtils.success("更新成功"); - } - - - @PostMapping("/warehouse/bussinessType/insert") - public BaseResponse insertBussinessType(@RequestBody BussinessTypeEntity bussinessTypeEntity, BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - if (bussinessTypeEntity != null) { - bussinessTypeService.insertBussinessType(bussinessTypeEntity); - } else { - ResultVOUtils.error(999, "参数错误"); - } - return ResultVOUtils.success("添加成功"); - } - -} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/receipts/ManuOrderController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/receipts/ManuOrderController.java deleted file mode 100644 index 239d9b9..0000000 --- a/api-udims/src/main/java/com/glxp/udi/admin/controller/receipts/ManuOrderController.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.glxp.udi.admin.controller.receipts; - - -import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageInfo; -import com.glxp.udi.admin.entity.inout.Druginfo; -import com.glxp.udi.admin.entity.receipt.ManuOrderEntity; -import com.glxp.udi.admin.req.inout.DeleteRequest; -import com.glxp.udi.admin.req.receipt.ManuorderFilterRequest; -import com.glxp.udi.admin.res.PageSimpleResponse; -import com.glxp.udi.admin.res.inout.MipsManuorderResponse; -import com.glxp.udi.admin.res.receipt.SelectManuorderResponse; -import com.glxp.udi.admin.service.inout.DruginfoService; -import com.glxp.udi.admin.service.receipts.ManuorderService; -import com.glxp.udi.admin.service.receipts.ProductService; -import com.glxp.udi.admin.util.HttpClient; -import com.glxp.udi.common.enums.ResultEnum; -import com.glxp.udi.common.res.BaseResponse; -import com.glxp.udi.common.util.ResultVOUtils; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@RestController -public class ManuOrderController { - @Resource - private ManuorderService manuorderService; - @Resource - private DruginfoService druginfoService; - - @Resource - private ProductService productService; - - @Value("${UDIC_MIPSDOWNLOAD_URL}") - private String url; - - @GetMapping("/warehouse/manuorder/filter") - public BaseResponse filterReceipt(ManuorderFilterRequest manuorderFilterRequest, - BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - List manuOrderEntities; - - manuOrderEntities = manuorderService.filterList(manuorderFilterRequest); - - PageInfo pageInfo; - pageInfo = new PageInfo<>(manuOrderEntities); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(manuOrderEntities); - return ResultVOUtils.success(pageSimpleResponse); - } - - - @GetMapping("warehouse/manuorder/import") - public BaseResponse importManuorder(ManuorderFilterRequest manuorderFilterRequest) { - Map paramMap = new HashMap<>(16); - paramMap.put("page", manuorderFilterRequest.getPage()); - paramMap.put("limit", manuorderFilterRequest.getLimit()); - paramMap.put("BatchNo", manuorderFilterRequest.getBatchNo()); - paramMap.put("startTime", manuorderFilterRequest.getStartTime()); - paramMap.put("endTime", manuorderFilterRequest.getEndTime()); - String response = HttpClient.mipsGet(url + "/mips/manuorder/filter", paramMap); - MipsManuorderResponse mipsManuorderResponse; - try { - mipsManuorderResponse = (MipsManuorderResponse) JSONObject.parseObject(response, MipsManuorderResponse.class); - } catch (Exception e) { - return ResultVOUtils.error(911, "连接mips服务出错"); - } - if (mipsManuorderResponse.getCode() == 20000) { - List mipsDrugEntities = mipsManuorderResponse.getData().getList(); - if (mipsDrugEntities != null) { - List selectManuorderResponses = new ArrayList<>(); - for (ManuOrderEntity manuOrderEntity : mipsDrugEntities) { - Druginfo druginfo = druginfoService.selectByNamecode(manuOrderEntity.getCodeNum()); - SelectManuorderResponse selectManuorderResponse = new SelectManuorderResponse(); - selectManuorderResponse.setBatchNo(manuOrderEntity.getBatchNo()); - selectManuorderResponse.setCloseFlag(manuOrderEntity.getCloseFlag()); - selectManuorderResponse.setCodeNum(manuOrderEntity.getCodeNum()); - selectManuorderResponse.setComments(manuOrderEntity.getComments()); - selectManuorderResponse.setDrugProductionDate(manuOrderEntity.getDrugProductionDate()); - selectManuorderResponse.setDrugShelfLifeToDate(manuOrderEntity.getDrugShelfLifeToDate()); - selectManuorderResponse.setLastModifyTime(manuOrderEntity.getLastModifyTime()); - selectManuorderResponse.setName(druginfo.getConame()); - selectManuorderResponse.setOrderNo(manuOrderEntity.getOrderNo()); - selectManuorderResponse.setOrderQty(manuOrderEntity.getOrderQty()); - selectManuorderResponse.setPackRatio(druginfo.getPackratio()); - selectManuorderResponse.setSpec(druginfo.getPackspec()); - if (productService.isExit(manuOrderEntity.getOrderNo())) - selectManuorderResponse.setIsUpdate("是"); - else - selectManuorderResponse.setIsUpdate("否"); - selectManuorderResponse.setUuid(druginfo.getUuid()); - selectManuorderResponse.setOrderID(manuOrderEntity.getID() + ""); - selectManuorderResponses.add(selectManuorderResponse); - } - PageInfo pageInfo; - pageInfo = new PageInfo<>(selectManuorderResponses); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(selectManuorderResponses); - return ResultVOUtils.success(pageSimpleResponse); - } - } else { - return ResultVOUtils.error(911, "导入失败"); - } - return ResultVOUtils.error(911, "导入失败"); - } - - @PostMapping("/warehouse/manuorder/delete") - public BaseResponse deleteProduct(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - String id = deleteRequest.getId(); - - manuorderService.deleteById(id); - - return ResultVOUtils.success("删除成功"); - } - -} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/receipts/MipsBarcodeController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/receipts/MipsBarcodeController.java deleted file mode 100644 index 6220a85..0000000 --- a/api-udims/src/main/java/com/glxp/udi/admin/controller/receipts/MipsBarcodeController.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.glxp.udi.admin.controller.receipts; - -import com.github.pagehelper.PageInfo; -import com.glxp.udi.admin.entity.receipt.MipsBarcodeEntity; -import com.glxp.udi.admin.req.receipt.MipsBarcodeRequest; -import com.glxp.udi.admin.res.PageSimpleResponse; -import com.glxp.udi.admin.service.receipts.MipsBarcodeService; -import com.glxp.udi.common.enums.ResultEnum; -import com.glxp.udi.common.res.BaseResponse; -import com.glxp.udi.common.util.ResultVOUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.List; - -@RestController -public class MipsBarcodeController { - - @Resource - private MipsBarcodeService mipsBarcodeService; - - - @GetMapping("/warehouse/barcodes/filter") - public BaseResponse filterBarcodes(MipsBarcodeRequest mipsBarcodeRequest, - BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - List manuOrderEntities; - - manuOrderEntities = mipsBarcodeService.filterBarcodes(mipsBarcodeRequest); - - PageInfo pageInfo; - pageInfo = new PageInfo<>(manuOrderEntities); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(manuOrderEntities); - return ResultVOUtils.success(pageSimpleResponse); - } -} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/receipts/ProductController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/receipts/ProductController.java deleted file mode 100644 index 14fc8b4..0000000 --- a/api-udims/src/main/java/com/glxp/udi/admin/controller/receipts/ProductController.java +++ /dev/null @@ -1,248 +0,0 @@ -package com.glxp.udi.admin.controller.receipts; - -import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageInfo; -import com.glxp.udi.admin.entity.receipt.MipsBarcodeEntity; -import com.glxp.udi.admin.entity.receipt.ProductOrderEntity; -import com.glxp.udi.admin.entity.udid.UdiEntity; -import com.glxp.udi.admin.req.inout.DeleteRequest; -import com.glxp.udi.admin.req.receipt.AddProductRequest; -import com.glxp.udi.admin.req.receipt.ProductFilterRequest; -import com.glxp.udi.admin.req.receipt.ProductMipsRequest; -import com.glxp.udi.admin.req.udid.VerifyCodeRequest; -import com.glxp.udi.admin.res.PageSimpleResponse; -import com.glxp.udi.admin.res.receipt.MipsBarcodeResponse; -import com.glxp.udi.admin.res.receipt.SelectManuorderResponse; -import com.glxp.udi.admin.service.receipts.MipsBarcodeService; -import com.glxp.udi.admin.service.receipts.ProductService; -import com.glxp.udi.admin.util.FilterUdiUtils; -import com.glxp.udi.admin.util.HttpClient; -import com.glxp.udi.common.enums.ResultEnum; -import com.glxp.udi.common.res.BaseResponse; -import com.glxp.udi.common.util.ResultVOUtils; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 生产订单 - */ -@RestController -public class ProductController { - - - @Resource - private ProductService productService; - @Resource - private MipsBarcodeService mipsBarcodeService; - @Value("${UDIC_MIPSDOWNLOAD_URL}") - private String url; - - /** - * 生产订单搜索 - * - * @param productFilterRequest - * @param bindingResult - * @return - */ - @GetMapping("/warehouse/product/filter") - public BaseResponse filterReceipt(ProductFilterRequest productFilterRequest, - BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - List productOrderEntities; - - productOrderEntities = productService.filterList(productFilterRequest); - - PageInfo pageInfo; - pageInfo = new PageInfo<>(productOrderEntities); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(productOrderEntities); - return ResultVOUtils.success(pageSimpleResponse); - } - - @PostMapping("/warehouse/product/delete") - public BaseResponse deleteProduct(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - String id = deleteRequest.getId(); - - productService.deleteById(id); - - return ResultVOUtils.success("删除成功"); - } - - @PostMapping("/warehouse/product/update") - public BaseResponse updateProduct(@RequestBody ProductOrderEntity productOrderEntity, - BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - if (productOrderEntity != null) { - productService.updateProduct(productOrderEntity); - } else { - ResultVOUtils.error(999, "参数错误"); - } - return ResultVOUtils.success("更新成功"); - } - - @PostMapping("/warehouse/product/insert") - public BaseResponse insertProduct(@RequestBody AddProductRequest addProductRequest, BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - if (addProductRequest != null) { - productService.insertProduct(addProductRequest); - } else { - ResultVOUtils.error(999, "参数错误"); - } - return ResultVOUtils.success("添加成功"); - } - - @PostMapping("/warehouse/product/insertmips") - public BaseResponse insertMips(@RequestBody ProductMipsRequest productMipsRequest, BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - if (productMipsRequest != null) { - List selectManuorderResponses = productMipsRequest.getSelectManuorderResponseList(); - if (selectManuorderResponses != null && selectManuorderResponses.size() > 0) { - List productOrderEntities = new ArrayList<>(); - - for (SelectManuorderResponse selectManuorderResponse : selectManuorderResponses) { - ProductOrderEntity productOrderEntity = new ProductOrderEntity(); - productOrderEntity.setCount(selectManuorderResponse.getOrderQty()); - productOrderEntity.setBatchNo(selectManuorderResponse.getBatchNo()); - productOrderEntity.setCloseFlag(Integer.parseInt(selectManuorderResponse.getCloseFlag())); - productOrderEntity.setComments(selectManuorderResponse.getComments()); - productOrderEntity.setExpirationDate(selectManuorderResponse.getDrugShelfLifeToDate()); - productOrderEntity.setOrderNo(selectManuorderResponse.getOrderNo()); - productOrderEntity.setManufacturingDate(selectManuorderResponse.getDrugProductionDate()); - productOrderEntity.setUdi(selectManuorderResponse.getUuid()); - productOrderEntity.setOrderId(selectManuorderResponse.getOrderID()); - productOrderEntities.add(productOrderEntity); - } - productService.insertProductList(productOrderEntities); - - for (ProductOrderEntity productOrderEntity : productOrderEntities) { - Map paramMap = new HashMap<>(); - paramMap.put("orderId", productOrderEntity.getOrderId()); - String response = HttpClient.mipsGet(url + "/mips/barcode/list", paramMap); - MipsBarcodeResponse mipsBarcodeResponse; - try { - mipsBarcodeResponse = (MipsBarcodeResponse) JSONObject.parseObject(response, MipsBarcodeResponse.class); - } catch (Exception e) { - return ResultVOUtils.error(911, "连接mips服务出错"); - } - if (mipsBarcodeResponse.getCode() == 20000) { - List mipsBarcodes = mipsBarcodeResponse.getData().getList(); - - if(mipsBarcodes!=null && mipsBarcodes.size()>0){ - List mipsBarcodeEntities = new ArrayList<>(); - for (MipsBarcodeResponse.DataBean.ListBean mipsBean :mipsBarcodes){ - MipsBarcodeEntity mipsBarcodeEntity = new MipsBarcodeEntity(); - mipsBarcodeEntity.setBatchNo(productOrderEntity.getBatchNo()); - mipsBarcodeEntity.setCloseFlag(productOrderEntity.getCloseFlag()+""); - mipsBarcodeEntity.setCode(mipsBean.getBarcode()); - mipsBarcodeEntity.setCodeLevel(mipsBean.getCodeLevel()); - mipsBarcodeEntity.setComments(productOrderEntity.getComments()); - mipsBarcodeEntity.setCount(productOrderEntity.getCount()+""); - mipsBarcodeEntity.setExpirationDate(productOrderEntity.getExpirationDate()); - mipsBarcodeEntity.setLastModifyTime(mipsBean.getPackTime()); - mipsBarcodeEntity.setManufacturingDate(productOrderEntity.getManufacturingDate()); - mipsBarcodeEntity.setOrderId(productOrderEntity.getOrderNo()); - mipsBarcodeEntity.setPackFlag(mipsBean.getPackFlag()); - mipsBarcodeEntity.setPCode(mipsBean.getParentCodeID()+""); - mipsBarcodeEntities.add(mipsBarcodeEntity); - } - mipsBarcodeService.insertList(mipsBarcodeEntities); - } - - -// if (mipsDrugEntities != null) { -// List selectManuorderResponses = new ArrayList<>(); -// for(ManuOrderEntity manuOrderEntity:mipsDrugEntities){ -// Druginfo druginfo = druginfoService.selectByNamecode(manuOrderEntity.getCodeNum()); -// SelectManuorderResponse selectManuorderResponse = new SelectManuorderResponse(); -// selectManuorderResponse.setBatchNo(manuOrderEntity.getBatchNo()); -// selectManuorderResponse.setCloseFlag(manuOrderEntity.getCloseFlag()); -// selectManuorderResponse.setCodeNum(manuOrderEntity.getCodeNum()); -// selectManuorderResponse.setComments(manuOrderEntity.getComments()); -// selectManuorderResponse.setDrugProductionDate(manuOrderEntity.getDrugProductionDate()); -// selectManuorderResponse.setDrugShelfLifeToDate(manuOrderEntity.getDrugShelfLifeToDate()); -// selectManuorderResponse.setLastModifyTime(manuOrderEntity.getLastModifyTime()); -// selectManuorderResponse.setName(druginfo.getConame()); -// selectManuorderResponse.setOrderNo(manuOrderEntity.getOrderNo()); -// selectManuorderResponse.setOrderQty(manuOrderEntity.getOrderQty()); -// selectManuorderResponse.setPackRatio(druginfo.getPackratio()); -// selectManuorderResponse.setSpec(druginfo.getPackspec()); -// selectManuorderResponse.setUpdate(manuorderService.isExit(manuOrderEntity.getOrderNo())); -// selectManuorderResponse.setUuid(druginfo.getUuid()); -// selectManuorderResponses.add(selectManuorderResponse); -// } -// PageInfo pageInfo; -// pageInfo = new PageInfo<>(selectManuorderResponses); -// PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); -// pageSimpleResponse.setTotal(pageInfo.getTotal()); -// pageSimpleResponse.setList(selectManuorderResponses); -// return ResultVOUtils.success(pageSimpleResponse); - } else { - return ResultVOUtils.error(911, "导入失败"); - } - } - } -// productService.insertProduct(addProductRequest); - } - return null; - } - - - /** - * 生产订单验证 - * - * @param verifyCodeRequest - * @return - */ - @PostMapping("/warehouse/product/verify") - public BaseResponse verifyCode(@RequestBody VerifyCodeRequest verifyCodeRequest) { - - String code = verifyCodeRequest.getKey(); - UdiEntity udiEntity = FilterUdiUtils.getUdi(code); - return ResultVOUtils.success(udiEntity); - - } - - /** - * 更新验证数量 - * - * @param deleteRequest - * @return - */ - @PostMapping("/warehouse/product/updateCount") - public BaseResponse updateCount(@RequestBody DeleteRequest deleteRequest) { - ProductOrderEntity productOrderEntity = productService.selectById(deleteRequest.getId()); - int count = productOrderEntity.getCount(); - productOrderEntity.setCount(count + 1); - productService.updateProduct(productOrderEntity); - return ResultVOUtils.success("更新成功"); - } - - -} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/receipts/ProductInfoController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/receipts/ProductInfoController.java deleted file mode 100644 index 18e56ff..0000000 --- a/api-udims/src/main/java/com/glxp/udi/admin/controller/receipts/ProductInfoController.java +++ /dev/null @@ -1,373 +0,0 @@ -package com.glxp.udi.admin.controller.receipts; - -import com.github.pagehelper.PageInfo; -import com.glxp.udi.admin.dao.inout.DruginfoMapper; -import com.glxp.udi.admin.entity.auth.AuthAdmin; -import com.glxp.udi.admin.entity.contrast.DownloadInfoResponse; -import com.glxp.udi.admin.entity.inout.Druginfo; -import com.glxp.udi.admin.entity.receipt.CountProductEntity; -import com.glxp.udi.admin.entity.receipt.ProductInfoEntity; -import com.glxp.udi.admin.entity.udid.DeviceEntity; -import com.glxp.udi.admin.entity.udid.Devicepackage; -import com.glxp.udi.admin.exception.JsonException; -import com.glxp.udi.admin.req.inout.DeleteRequest; -import com.glxp.udi.admin.req.receipt.AddByCodeRequest; -import com.glxp.udi.admin.req.receipt.CombineDrugRequest; -import com.glxp.udi.admin.req.receipt.CombineRequest; -import com.glxp.udi.admin.req.receipt.ProductInfoFilterRequest; -import com.glxp.udi.admin.res.PageSimpleResponse; -import com.glxp.udi.admin.res.inout.ProductInfoResponse; -import com.glxp.udi.admin.service.auth.AuthAdminService; -import com.glxp.udi.admin.service.inout.DeviceService; -import com.glxp.udi.admin.service.inout.DruginfoService; -import com.glxp.udi.admin.service.receipts.ProductInfoService; -import com.glxp.udi.common.enums.ResultEnum; -import com.glxp.udi.common.res.BaseResponse; -import com.glxp.udi.common.util.ResultVOUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -/** - * 产品信息维护 - */ -@RestController -public class ProductInfoController { - - @Resource - private ProductInfoService productInfoService; - @Resource - private DeviceService deviceService; - - @Resource - private DruginfoMapper druginfoMapper; - @Resource - private DruginfoService druginfoService; - @Resource - private AuthAdminService authAdminService; - - - @GetMapping("/warehouse/productInfo/filter") - public BaseResponse filterReceipt(ProductInfoFilterRequest productInfoFilterRequest, - BindingResult bindingResult) { - - ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - if (attributes == null) { - throw new JsonException(ResultEnum.NOT_NETWORK); - } - HttpServletRequest request = attributes.getRequest(); - String userId = request.getHeader("ADMIN_ID"); - AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); - - productInfoFilterRequest.setCustomerId(authAdmin.getCustomerId()); - List productInfoResponses = null; - if (productInfoFilterRequest.getAddType() == 2) { //药品查询 - productInfoResponses = productInfoService.filterDrugList(productInfoFilterRequest); - } else if (productInfoFilterRequest.getAddType() == 1) { - productInfoResponses = productInfoService.filterUdiList(productInfoFilterRequest); - - } - PageInfo pageInfo; - pageInfo = new PageInfo<>(productInfoResponses); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(productInfoResponses); - return ResultVOUtils.success(pageSimpleResponse); - } - - @GetMapping("/salewarehouse/productInfo/download") - public BaseResponse downloadProducts(ProductInfoFilterRequest productInfoFilterRequest, - BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - - productInfoFilterRequest.setAddType(2); - List productInfoResponses = null; - productInfoResponses = productInfoService.filterDrugList(productInfoFilterRequest); - List downloadInfoResponses = new ArrayList<>(); - if (productInfoResponses != null && productInfoResponses.size() > 0) { - - for (int i = 0; i < productInfoResponses.size(); i++) { - DownloadInfoResponse downloadInfoResponse = new DownloadInfoResponse(); - BeanUtils.copyProperties(productInfoResponses.get(i), downloadInfoResponse); - downloadInfoResponses.add(downloadInfoResponse); - } - } - - PageInfo pageInfo; - pageInfo = new PageInfo<>(downloadInfoResponses); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(downloadInfoResponses); - return ResultVOUtils.success(pageSimpleResponse); - } - - @PostMapping("/warehouse/productInfo/combine") - public BaseResponse combine(@RequestBody CombineRequest combineRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - List keys = combineRequest.getKeys(); - if (keys != null && keys.size() > 0) { - for (String key : keys) { - - DeviceEntity deviceEntity = deviceService.searchById(key); - ProductInfoEntity productInfoEntity = new ProductInfoEntity(); - productInfoEntity.setThirdProductNo(combineRequest.getThirdId()); - productInfoEntity.setDeviceRecordKey(deviceEntity.getDevicerecordkey()); - productInfoEntity.setNameCode(deviceEntity.getZxxsdycpbs()); - productInfoEntity.setAddType(1 + ""); - productInfoEntity.setBhxjcpbm(""); - productInfoEntity.setBhxjsl(1); - productInfoEntity.setBzcj(""); - productInfoEntity.setBhzxxsbzsl(1); - productInfoEntity.setPackLevel(1 + ""); - productInfoEntity.setZxxsbzbhsydysl(Integer.parseInt(deviceEntity.getZxxsdyzsydydsl())); - productInfoService.insertProductInfo(productInfoEntity); - List devicepackages = deviceEntity.getDevicepackages(); - List countProductEntities = new ArrayList<>(); - if (devicepackages != null && devicepackages.size() > 0) { - HashMap packRation = new HashMap<>(); - for (Devicepackage devicepackage : devicepackages) { - CountProductEntity countProductEntity = new CountProductEntity(); - Devicepackage head = devicepackage; - int level = 2; //包装层级，初始为2，最小销售单元为1 - int zxbsCount = devicepackage.getBznhxyjcpbssl(); //最小销售单元数量 - int count = 1; //计数，如果计数超过包装标识层级，就是死循环，包装标识有误 - while (!head.getBznhxyjbzcpbs().equals(deviceEntity.getZxxsdycpbs())) { - head = getNext(devicepackages, head); - if (head == null) { - return ResultVOUtils.error(999, "器械设备包装标识有误"); - } - count++; - if (count > devicepackages.size()) { - return ResultVOUtils.error(999, "器械设备包装标识有误"); - } - level++; - zxbsCount = zxbsCount * head.getBznhxyjcpbssl(); - - } - packRation.put(level - 1 + "", devicepackage.getBznhxyjcpbssl() + ""); - countProductEntity.setLevel(level); - countProductEntity.setZxbsCount(zxbsCount); - countProductEntities.add(countProductEntity); - } - CountProductEntity max = getMaxLevel(countProductEntities); - packRation.put(max.getLevel() + "", max.getZxbsCount() + ""); - for (int i = 0; i < devicepackages.size(); i++) { - Devicepackage devicepackage = devicepackages.get(i); - CountProductEntity countProductEntity = countProductEntities.get(i); - productInfoEntity.setNameCode(devicepackage.getBzcpbs()); - productInfoEntity.setBhxjcpbm(devicepackage.getBznhxyjbzcpbs()); - productInfoEntity.setBhxjsl(devicepackage.getBznhxyjcpbssl()); - productInfoEntity.setBzcj(devicepackage.getCpbzjb()); - - productInfoEntity.setBhzxxsbzsl(countProductEntity.getZxbsCount()); - productInfoEntity.setPackLevel(countProductEntity.getLevel() + ""); - productInfoService.insertProductInfo(productInfoEntity); - } - } - } - } - return ResultVOUtils.success("合并成功"); - } - - public Devicepackage getNext(List devicepackages, Devicepackage devicepackage) { - - if (devicepackages != null && devicepackages.size() > 0) { - for (int i = 0; i < devicepackages.size(); i++) { - Devicepackage temp = devicepackages.get(i); - if (temp.getBzcpbs().equals(devicepackage.getBznhxyjbzcpbs())) { - return temp; - } - } - } - return null; - } - - public CountProductEntity getMaxLevel(List countProductEntities) { - int index = 0; - int max = 0; - for (int i = 0; i < countProductEntities.size(); i++) { - CountProductEntity countProductEntity = countProductEntities.get(i); - if (countProductEntity.getZxbsCount() > max) { - max = countProductEntity.getZxbsCount(); - index = i; - } - } - return countProductEntities.get(index); - } - - - @PostMapping("/warehouse/productInfo/combineDrug") - public BaseResponse combineDrug(@RequestBody CombineDrugRequest combineRequest, BindingResult bindingResult) { - ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - if (attributes == null) { - throw new JsonException(ResultEnum.NOT_NETWORK); - } - HttpServletRequest request = attributes.getRequest(); - String userId = request.getHeader("ADMIN_ID"); - AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); - List keys = new ArrayList<>(); - List uuids = combineRequest.getKeys(); - if (uuids != null && uuids.size() > 0) { - for (String uuid : uuids) { - List druginfoList = druginfoService.getDrugsByUuid(uuid); - if (druginfoList != null && druginfoList.size() > 0) { - for (Druginfo druginfo : druginfoList) { - keys.add(druginfo.getNamecode()); - } - } - } - } else return ResultVOUtils.error(999, "未选择转换药品信息"); - - if (keys != null && keys.size() > 0) { - for (String key : keys) { - - Druginfo druginfo = druginfoMapper.selectByPrimaryKey(key); - ProductInfoEntity productInfoEntity = new ProductInfoEntity(); - productInfoEntity.setThirdProductNo(combineRequest.getThirdId()); - productInfoEntity.setNameCode(druginfo.getNamecode()); - productInfoEntity.setPackLevel(druginfo.getPacklevel()); - productInfoEntity.setPackRatio(druginfo.getPackratio()); - productInfoEntity.setCustomerId(authAdmin.getCustomerId()); - productInfoEntity.setAddType(2 + ""); - String packRation = druginfo.getPackratio(); - if (packRation != null && packRation.contains(":")) { - String packArray[] = packRation.split(":"); - int level = Integer.parseInt(druginfo.getPacklevel()); - int length = packArray.length; - int total = Integer.parseInt(packArray[length - 1]); - int current = Integer.parseInt(packArray[length - level]); - int zxxsCount = total / current; - productInfoEntity.setBhzxxsbzsl(zxxsCount); - if (level > 1) { - List druginfoList = druginfoService.getSimplyDrugs(druginfo.getConame(), druginfo.getPackratio(), druginfo.getPackspec()); - if (druginfoList != null) { - for (Druginfo temp : druginfoList) { - int tempLevel = Integer.parseInt(temp.getPacklevel()); - if (!temp.getNamecode().equals(druginfo.getNamecode()) && level - tempLevel == 1) { - productInfoEntity.setBhxjcpbm(temp.getNamecode()); - int tempTotal = Integer.parseInt(packArray[length - tempLevel]); - int tempCurrent = Integer.parseInt(packArray[length - level]); - int count = tempTotal / tempCurrent; - productInfoEntity.setBhxjsl(count); - } - } - } - - } else { - - } - - } - productInfoService.insertProductInfo(productInfoEntity); - } - } - return ResultVOUtils.success("合并成功"); - } - - - @PostMapping("/warehouse/productInfo/delete") - public BaseResponse deleteProductInfo(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - String id = deleteRequest.getId(); - - productInfoService.deleteById(id); - - return ResultVOUtils.success("删除成功"); - } - - @PostMapping("/warehouse/productInfo/update") - public BaseResponse updateProductInfo(@RequestBody ProductInfoEntity productInfoEntity, BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - productInfoService.updateProductInfo(productInfoEntity); - return ResultVOUtils.success("更新成功"); - } - - - @PostMapping("/salewarehouse/productInfo/addByCode") - public BaseResponse addByCode(@RequestBody AddByCodeRequest addByCodeRequest, BindingResult bindingResult) { - ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - if (attributes == null) { - throw new JsonException(ResultEnum.NOT_NETWORK); - } - HttpServletRequest request = attributes.getRequest(); - String userId = request.getHeader("ADMIN_ID"); - AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); - - String code = addByCodeRequest.getCode(); - if (code == null || code.length() < 8) { - return ResultVOUtils.error(500, "药监码格式错误"); - } - code = code.substring(0, 7); - Druginfo druginfo = druginfoService.selectByNamecode(code); - if (druginfo == null) { - return ResultVOUtils.error(500, "未找到该药品信息"); - } - ProductInfoEntity productInfoEntity = new ProductInfoEntity(); - productInfoEntity.setNameCode(druginfo.getNamecode()); - productInfoEntity.setPackLevel(druginfo.getPacklevel()); - productInfoEntity.setPackRatio(druginfo.getPackratio()); - productInfoEntity.setCustomerId(authAdmin.getCustomerId()); - productInfoEntity.setAddType(2 + ""); - String packRation = druginfo.getPackratio(); - if (packRation != null && packRation.contains(":")) { - String packArray[] = packRation.split(":"); - int level = Integer.parseInt(druginfo.getPacklevel()); - int length = packArray.length; - int total = Integer.parseInt(packArray[length - 1]); - int current = Integer.parseInt(packArray[length - level]); - int zxxsCount = total / current; - productInfoEntity.setBhzxxsbzsl(zxxsCount); - if (level > 1) { - List druginfoList = druginfoService.getSimplyDrugs(druginfo.getConame(), druginfo.getPackratio(), druginfo.getPackspec()); - if (druginfoList != null) { - for (Druginfo temp : druginfoList) { - int tempLevel = Integer.parseInt(temp.getPacklevel()); - if (!temp.getNamecode().equals(druginfo.getNamecode()) && level - tempLevel == 1) { - productInfoEntity.setBhxjcpbm(temp.getNamecode()); - int tempTotal = Integer.parseInt(packArray[length - tempLevel]); - int tempCurrent = Integer.parseInt(packArray[length - level]); - int count = tempTotal / tempCurrent; - productInfoEntity.setBhxjsl(count); - } - } - } - } else { - - } - - } - productInfoService.insertProductInfo(productInfoEntity); - return ResultVOUtils.success("添加成功"); - } -} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/receipts/ReceiptsController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/receipts/ReceiptsController.java deleted file mode 100644 index 289388f..0000000 --- a/api-udims/src/main/java/com/glxp/udi/admin/controller/receipts/ReceiptsController.java +++ /dev/null @@ -1,192 +0,0 @@ -package com.glxp.udi.admin.controller.receipts; - -import com.github.pagehelper.PageInfo; -import com.glxp.udi.admin.dao.udid.DeviceMapper; -import com.glxp.udi.admin.entity.inout.WarehouseEntity; -import com.glxp.udi.admin.entity.receipt.ReceiptsEntity; -import com.glxp.udi.admin.entity.receipt.ReceiptsdDetailEntity; -import com.glxp.udi.admin.entity.udid.Device; -import com.glxp.udi.admin.req.inout.DeleteRequest; -import com.glxp.udi.admin.req.receipt.AddReceiptRequest; -import com.glxp.udi.admin.req.receipt.ReceiptDetailRequest; -import com.glxp.udi.admin.req.receipt.ReceiptFilterRequest; -import com.glxp.udi.admin.res.PageSimpleResponse; -import com.glxp.udi.admin.service.inout.WarehouseService; -import com.glxp.udi.admin.service.receipts.ReceiptDetailService; -import com.glxp.udi.admin.service.receipts.ReceiptsService; -import com.glxp.udi.admin.util.ReceiptBeanUtils; -import com.glxp.udi.common.enums.ResultEnum; -import com.glxp.udi.common.res.BaseResponse; -import com.glxp.udi.common.util.ResultVOUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@RestController -public class ReceiptsController { - - @Resource - private ReceiptsService receiptsService; - @Resource - private ReceiptDetailService receiptDetailService; - @Resource - private WarehouseService warehouseService; - @Resource - private DeviceMapper deviceMapper; - - - @GetMapping("/warehouse/receipt/order/filter") - public BaseResponse filterReceipt(ReceiptFilterRequest receiptFilterRequest, - BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - List receiptsEntities; - - receiptsEntities = receiptsService.filterList(receiptFilterRequest); - - PageInfo pageInfo; - pageInfo = new PageInfo<>(receiptsEntities); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(receiptsEntities); - return ResultVOUtils.success(pageSimpleResponse); - } - - @GetMapping("/warehouse/receipt/code/filter") - public BaseResponse listReceiptDetail(ReceiptDetailRequest receiptDetailRequest, - BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - List receiptsdDetailEntities; - - receiptsdDetailEntities = receiptDetailService.listReceiptsDetail(receiptDetailRequest); - - PageInfo pageInfo; - pageInfo = new PageInfo<>(receiptsdDetailEntities); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(receiptsdDetailEntities); - return ResultVOUtils.success(pageSimpleResponse); - } - - - @PostMapping("/warehouse/receipt/addList") - public BaseResponse addList(@RequestBody AddReceiptRequest addReceiptRequest, - BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - List receiptRequests = addReceiptRequest.getReceipts(); - List receiptsEntityList = new ArrayList<>(); - if (receiptRequests != null && receiptRequests.size() > 0) { - for (int i = 0; i < receiptRequests.size(); i++) { - ReceiptsEntity receiptsEntity = ReceiptBeanUtils.requestToEntity(receiptRequests.get(i), i); - receiptsEntityList.add(receiptsEntity); - } - receiptsService.insertReceipts(receiptsEntityList); - for (int i = 0; i < receiptsEntityList.size(); i++) { - ReceiptsEntity receiptsEntity = receiptsEntityList.get(i); - List warehouseEntityList = warehouseService.findByReceiptId(receiptsEntity.getReceiptNo()); - try { - filterReceipt(receiptsEntity.getId(), warehouseEntityList); - } catch (Exception e) { - e.printStackTrace(); - - return ResultVOUtils.error(500, "UDI码错误"); - } - } - } - return ResultVOUtils.success("添加成功"); - } - - public void drugFilter(){ - - } - - public void filterReceipt(String receiptId, List warehouseEntityList) { - Map groups = new HashMap(); - List receiptsdDetailEntities = new ArrayList<>(); - for (WarehouseEntity warehouseEntity : warehouseEntityList) { - String code = warehouseEntity.getCode().substring(2, 16); - groups.put(code, 0); - } - for (String code : groups.keySet()) { - int count = 0; - WarehouseEntity temp = null; - for (WarehouseEntity warehouseEntity : warehouseEntityList) { - if (warehouseEntity.getCode().substring(2, 16).equals(code)) { - count++; - temp = warehouseEntity; - groups.put(code, count); - } - } - Device device = deviceMapper.searchByBs(code); - ReceiptsdDetailEntity receiptsdDetailEntity = new ReceiptsdDetailEntity(); - receiptsdDetailEntity.setReceiptId(receiptId); - receiptsdDetailEntity.setCode(code); - receiptsdDetailEntity.setName(device.getCpmctymc()); - receiptsdDetailEntity.setSpec(device.getGgxh()); - receiptsdDetailEntity.setPermitNo(device.getZczbhhzbapzbh()); - receiptsdDetailEntity.setCount(count); - receiptsdDetailEntity.setEnterprise(device.getYlqxzcrbarmc()); - receiptsdDetailEntity.setStockRange(device.getTscchcztj()); - - if (temp != null) { - receiptsdDetailEntity.setInoutDate(temp.getActDate()); - receiptsdDetailEntity.setUnit(temp.getFromCorp()); - receiptsdDetailEntity.setBatchNo(temp.getBatchNo()); - receiptsdDetailEntity.setExpireDate(temp.getExpireDate()); - receiptsdDetailEntity.setProduceDate(temp.getProduceDate()); - } - receiptsdDetailEntity.setIsGift(""); - receiptsdDetailEntity.setRemark(""); - receiptsdDetailEntity.setTonCount(0); - receiptsdDetailEntities.add(receiptsdDetailEntity); - } - receiptDetailService.insertReceiptsDetails(receiptsdDetailEntities); - } - - - @PostMapping("/warehouse/receipt/updateReceipt") - public BaseResponse updateReceipt(@RequestBody ReceiptsEntity receiptsEntity, - BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - if (receiptsEntity != null) { - receiptsService.updateReceipts(receiptsEntity); - } else { - ResultVOUtils.error(999, "参数错误"); - } - - - return ResultVOUtils.success("添加成功"); - } - - @PostMapping("warehouse/receipt/deleteReceipt") - public BaseResponse deleteReceipt(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - String id = deleteRequest.getId(); - - receiptsService.deleteById(id); - - return ResultVOUtils.success("删除成功"); - } -} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/receipts/UnitMaintainController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/receipts/UnitMaintainController.java deleted file mode 100644 index e4c3fce..0000000 --- a/api-udims/src/main/java/com/glxp/udi/admin/controller/receipts/UnitMaintainController.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.glxp.udi.admin.controller.receipts; - -import com.github.pagehelper.PageInfo; -import com.glxp.udi.admin.entity.inout.Unit; -import com.glxp.udi.admin.entity.receipt.UnitMaintainEntity; -import com.glxp.udi.admin.req.inout.DeleteRequest; -import com.glxp.udi.admin.req.receipt.CombineUnitRequest; -import com.glxp.udi.admin.req.receipt.UnitMaintainFilterRequest; -import com.glxp.udi.admin.res.PageSimpleResponse; -import com.glxp.udi.admin.service.inout.UnitService; -import com.glxp.udi.admin.service.receipts.UnitMaintainService; -import com.glxp.udi.common.enums.ResultEnum; -import com.glxp.udi.common.res.BaseResponse; -import com.glxp.udi.common.util.ResultVOUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 往来单位信息维护 - */ -@RestController -public class UnitMaintainController { - - @Resource - private UnitMaintainService unitMaintainService; - @Resource - private UnitService unitService; - - @GetMapping("/warehouse/unitMaintain/filter") - public BaseResponse filterUnitMaintain(UnitMaintainFilterRequest unitMaintainFilterRequest, - BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - List unitMaintainEntities; - unitMaintainEntities = unitMaintainService.filterList(unitMaintainFilterRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(unitMaintainEntities); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(unitMaintainEntities); - return ResultVOUtils.success(pageSimpleResponse); - } - - - @PostMapping("/warehouse/unitMaintain/combine") - public BaseResponse combine(@RequestBody CombineUnitRequest combineRequest, BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - List keys = combineRequest.getKeys(); - if (keys != null && keys.size() > 0) { - for (String key : keys) { - Unit unit = unitService.selectById(key); - UnitMaintainEntity unitMaintainEntity = new UnitMaintainEntity(); - unitMaintainEntity.setThirdId(combineRequest.getThirdId());//关联第三方ID - unitMaintainEntity.setAddr(unit.getAddr()); - unitMaintainEntity.setName(unit.getName()); - unitMaintainEntity.setSpell(unit.getSpell()); - unitMaintainEntity.setStatus(unit.getStatus()); - unitMaintainEntity.setType(unit.getType()); - unitMaintainEntity.setUnitId(unit.getUnitId()); - unitMaintainService.insertUnitMaintain(unitMaintainEntity); - } - } - - return ResultVOUtils.success("合并成功"); - } - - - @PostMapping("/warehouse/unitMaintain/delete") - public BaseResponse deleteUnitMaintain(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - String id = deleteRequest.getId(); - - unitMaintainService.deleteById(id); - - return ResultVOUtils.success("删除成功"); - } -} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/dao/info/IdentifierDao.java b/api-udims/src/main/java/com/glxp/udi/admin/dao/info/IdentifierDao.java index fdb211c..e5114a1 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/dao/info/IdentifierDao.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/dao/info/IdentifierDao.java @@ -26,7 +26,10 @@ public interface IdentifierDao { String randomCode(FilterIdentifierRequest filterIdentifierRequest); Integer isUsed(String facidentcode); + Integer isUsedIdentifyCode(String code); + boolean updateIsUsed(IdentifierEntity identifierEntity); + List selectIdentifyCode(String code); } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/dao/info/SetupDao.java b/api-udims/src/main/java/com/glxp/udi/admin/dao/info/SetupDao.java new file mode 100644 index 0000000..4efcf7e --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/dao/info/SetupDao.java @@ -0,0 +1,16 @@ +package com.glxp.udi.admin.dao.info; + +import com.glxp.udi.admin.entity.info.SetupEntity; +import com.glxp.udi.admin.req.info.FilterSetupRequest; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SetupDao { + + SetupEntity findSetup(FilterSetupRequest filterSetupRequest); + + boolean modifySetup(SetupEntity setupEntity); + + boolean insertSetup(SetupEntity setupEntity); + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/dao/inout/MyErpOrderDao.java b/api-udims/src/main/java/com/glxp/udi/admin/dao/inout/MyErpOrderDao.java new file mode 100644 index 0000000..e5e539f --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/dao/inout/MyErpOrderDao.java @@ -0,0 +1,43 @@ +package com.glxp.udi.admin.dao.inout; + +import com.glxp.udi.admin.entity.inout.ErpOrderEntity; +import com.glxp.udi.admin.req.inout.FilterErpOrderRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface MyErpOrderDao { + + List filterMyErpOrder(FilterErpOrderRequest filterErpOrderRequest); + + List findByStockCheck(@Param("orderids") List orderids); + + List filterMyErpMainOrder(FilterErpOrderRequest filterErpOrderRequest); + + List filterMyErpDetailOrder(FilterErpOrderRequest filterErpOrderRequest); + + List findAllByDocids(@Param("docids") List docids); + + List filterAllDocid(FilterErpOrderRequest filterErpOrderRequest); + + List filterAllDocidE(FilterErpOrderRequest filterErpOrderRequest); + + boolean insertErpOrders(@Param("erpOrderEntities") List erpOrderEntities); + + boolean insertErpOrder(ErpOrderEntity erpOrderEntity); + + boolean updateErpOrder(ErpOrderEntity erpOrderEntity); + + boolean deleteById(@Param("id") String id); + + boolean deleteByPrimiyId(@Param("id") String id); + + + Integer isExit(@Param("docid") String docid); + + List selectAllIds(@Param("docids") List docids); + + boolean deleteByOrderId(@Param("id") String id); +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/dao/inout/OrderDao.java b/api-udims/src/main/java/com/glxp/udi/admin/dao/inout/OrderDao.java index b223c3b..abb9463 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/dao/inout/OrderDao.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/dao/inout/OrderDao.java @@ -16,6 +16,8 @@ public interface OrderDao { boolean insertOrder(OrderEntity orderEntity); + boolean updateOrder(OrderEntity orderEntity); + List listOrderError(OrderQueryRequest orderQueryRequest); List listOrderRepeat(OrderQueryRequest orderQueryRequest); @@ -30,9 +32,17 @@ public interface OrderDao { boolean updateExportStatus(@Param("orderId") String orderId, @Param("exportStatus") String exportStatus); + boolean updateContrastStatus(@Param("orderId") String orderId, @Param("contrastStatus") String contrastStatus); + + boolean updateSignStatus(@Param("orderId") String orderId, @Param("signStatus") String signStatus); + boolean updateRemark(@Param("orderId") String orderId, @Param("remark") String remark); List filterList(OrderFilterRequest orderFilterRequest); List filterListByCode(@Param("warehouseEntityList") List warehouseEntityList); + + OrderEntity findOne(OrderFilterRequest orderFilterRequest); + + } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/dao/inout/UdiInfoDao.java b/api-udims/src/main/java/com/glxp/udi/admin/dao/inout/UdiInfoDao.java new file mode 100644 index 0000000..4a41833 --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/dao/inout/UdiInfoDao.java @@ -0,0 +1,37 @@ +package com.glxp.udi.admin.dao.inout; + +import com.glxp.udi.admin.entity.inout.UdiInfoEntity; +import com.glxp.udi.admin.req.inout.FilterUdiInfoRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface UdiInfoDao { + + List filterUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest); + + List filterUdiInfoGp(FilterUdiInfoRequest filterUdiInfoRequest); + + UdiInfoEntity findByNameCode(@Param("nameCode") String nameCode); + + UdiInfoEntity findByUuid(@Param("uuid") String uuid); + + List findByUuids(@Param("uuid") String uuid); + + + UdiInfoEntity selectById(@Param("id") String id); + + boolean insertUdiInfo(UdiInfoEntity udiInfoEntity); + + boolean insertUdiInfos(@Param("udiInfoEntities") List udiInfoEntities); + + boolean updateUdiInfo(UdiInfoEntity udiInfoEntity); + boolean updateUdiInfoByUuid(UdiInfoEntity udiInfoEntity); + + boolean deleteById(@Param("id") String id); + + boolean deleteByUuid(@Param("uuid") String uuid); + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/dao/inout/UdiRelevanceDao.java b/api-udims/src/main/java/com/glxp/udi/admin/dao/inout/UdiRelevanceDao.java new file mode 100644 index 0000000..984b1c8 --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/dao/inout/UdiRelevanceDao.java @@ -0,0 +1,34 @@ +package com.glxp.udi.admin.dao.inout; + +import com.glxp.udi.admin.entity.inout.UdiRelevanceEntity; +import com.glxp.udi.admin.req.inout.FilterUdiInfoRequest; +import com.glxp.udi.admin.res.inout.UdiRelevanceResponse; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface UdiRelevanceDao { + + List filterUdiRelevance(FilterUdiInfoRequest filterUdiInfoRequest); + + List filterUdiGp(FilterUdiInfoRequest filterUdiInfoRequest); + + // UdiRelevanceResponse selectUdiByUUid + List selectByUuid(@Param("uuid") String uuid); + + UdiRelevanceEntity selectById(@Param("id") String id); + + UdiRelevanceEntity selectByThirdId(@Param("thirdId") String thirdId); + + boolean insertUdiRelevance(UdiRelevanceEntity udiRelevanceEntity); + + boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity); + + boolean deleteById(@Param("id") String id); + + boolean deleteByIds(@Param("ids") List id); + + boolean deleteByUuid(@Param("uuid") String uuid); +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/dao/receipt/UnitMaintainDao.java b/api-udims/src/main/java/com/glxp/udi/admin/dao/inout/UnitMaintainDao.java similarity index 66% rename from api-udims/src/main/java/com/glxp/udi/admin/dao/receipt/UnitMaintainDao.java rename to api-udims/src/main/java/com/glxp/udi/admin/dao/inout/UnitMaintainDao.java index 6703a78..ea3884f 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/dao/receipt/UnitMaintainDao.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/dao/inout/UnitMaintainDao.java @@ -1,7 +1,7 @@ -package com.glxp.udi.admin.dao.receipt; +package com.glxp.udi.admin.dao.inout; -import com.glxp.udi.admin.entity.receipt.UnitMaintainEntity; -import com.glxp.udi.admin.req.receipt.UnitMaintainFilterRequest; +import com.glxp.udi.admin.entity.inout.UnitMaintainEntity; +import com.glxp.udi.admin.req.inout.UnitMaintainFilterRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -16,4 +16,6 @@ public interface UnitMaintainDao { boolean deleteById(@Param("id") String id); UnitMaintainEntity selectById(@Param("id") String id); + + boolean updateUnit(UnitMaintainEntity unitMaintainEntity); } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/dao/inout/WarehouseDao.java b/api-udims/src/main/java/com/glxp/udi/admin/dao/inout/WarehouseDao.java index e6ff1b5..fb0e366 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/dao/inout/WarehouseDao.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/dao/inout/WarehouseDao.java @@ -1,6 +1,7 @@ package com.glxp.udi.admin.dao.inout; import com.glxp.udi.admin.entity.inout.WarehouseEntity; +import com.glxp.udi.admin.req.inout.FilterWarehouseRequest; import com.glxp.udi.admin.req.inout.WarehouseQueryRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -24,9 +25,14 @@ public interface WarehouseDao { List findByReceiptId(@Param("orderId") String orderId); - List findByCode(@Param("code") String code); + List findByCode(FilterWarehouseRequest filterWarehouseRequest); + + List searchCode(@Param("code") String code, @Param("customerId")Long customerId); boolean updateOrderId(@Param("oldOrderId") String oldOrderId, @Param("newOrderId") String newOrderId); boolean updateUnit(@Param("orderId") String orderId, @Param("fromCorpID") String fromCorpID, @Param("fromCorp") String fromCorp); + + List findCodesById(@Param("orderId") String orderId); + } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/dao/inout/WarehousetempMapper.java b/api-udims/src/main/java/com/glxp/udi/admin/dao/inout/WarehousetempMapper.java new file mode 100644 index 0000000..6ada560 --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/dao/inout/WarehousetempMapper.java @@ -0,0 +1,40 @@ +package com.glxp.udi.admin.dao.inout; + +import com.glxp.udi.admin.entity.inout.Warehousetemp; +import com.glxp.udi.admin.entity.inout.WarehousetempExample; +import com.glxp.udi.admin.req.inout.WarehouseQueryRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface WarehousetempMapper { + long countByExample(WarehousetempExample example); + + int deleteByExample(WarehousetempExample example); + + int deleteByPrimaryKey(Long id); + + int insert(Warehousetemp record); + + int insertSelective(Warehousetemp record); + + List selectByExample(WarehousetempExample example); + + Warehousetemp selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") Warehousetemp record, @Param("example") WarehousetempExample example); + + int updateByExample(@Param("record") Warehousetemp record, @Param("example") WarehousetempExample example); + + int updateByPrimaryKeySelective(Warehousetemp record); + + int updateByPrimaryKey(Warehousetemp record); + + int insertTempWarehouses(@Param("warehouseEntities") List warehouseEntities); + + int deleteTempWarehouses(@Param("warehouseEntities") List warehouseEntities); + + List findErrorByOrderId(WarehouseQueryRequest warehouseQueryRequest); +} \ No newline at end of file diff --git a/api-udims/src/main/java/com/glxp/udi/admin/dao/receipt/BussinessTypeDao.java b/api-udims/src/main/java/com/glxp/udi/admin/dao/receipt/BussinessTypeDao.java deleted file mode 100644 index c3a97f5..0000000 --- a/api-udims/src/main/java/com/glxp/udi/admin/dao/receipt/BussinessTypeDao.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.glxp.udi.admin.dao.receipt; - -import com.glxp.udi.admin.entity.receipt.BussinessTypeEntity; -import com.glxp.udi.admin.req.receipt.BussinessTypeFilterRequest; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface BussinessTypeDao { - - List filterList(BussinessTypeFilterRequest bussinessTypeFilterRequest); - - boolean insertBussinessType(BussinessTypeEntity bussinessTypeEntity); - - boolean updateBussinessType(BussinessTypeEntity bussinessTypeEntity); - - boolean deleteById(@Param("id") String id); - - -} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/dao/receipt/MipsBarcodeDao.java b/api-udims/src/main/java/com/glxp/udi/admin/dao/receipt/MipsBarcodeDao.java index e3ae74c..e68dac4 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/dao/receipt/MipsBarcodeDao.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/dao/receipt/MipsBarcodeDao.java @@ -1,6 +1,9 @@ package com.glxp.udi.admin.dao.receipt; import com.glxp.udi.admin.entity.receipt.MipsBarcodeEntity; +import com.glxp.udi.admin.entity.receipt.StockDetailEntity; +import com.glxp.udi.admin.req.receipt.FilterBatchnoCount; +import com.glxp.udi.admin.req.receipt.FilterStockRequest; import com.glxp.udi.admin.req.receipt.MipsBarcodeRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -11,6 +14,18 @@ import java.util.List; public interface MipsBarcodeDao { List selectByOrderId(@Param("orderId") String orderId); + List filterBarcodes(MipsBarcodeRequest mipsBarcodeRequest); + + List filterStock(FilterStockRequest filterStockRequest); + + Integer selectCountByBatchno(FilterBatchnoCount fIlterBatchnoCount); + boolean insertList(@Param("barcodeEntities") List barcodeEntities); + + boolean deleteByOrderId(String orderId); + + boolean updateDtFlag(@Param("codes") List codes); + + boolean deleteByCodes(@Param("codes") List codes); } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/dao/receipt/ProductDao.java b/api-udims/src/main/java/com/glxp/udi/admin/dao/receipt/ProductDao.java index e512471..e7a9e61 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/dao/receipt/ProductDao.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/dao/receipt/ProductDao.java @@ -1,5 +1,6 @@ package com.glxp.udi.admin.dao.receipt; +import com.glxp.udi.admin.entity.receipt.ProductOrderDetailEntity; import com.glxp.udi.admin.entity.receipt.ProductOrderEntity; import com.glxp.udi.admin.req.receipt.AddProductRequest; import com.glxp.udi.admin.req.receipt.ProductFilterRequest; @@ -11,10 +12,14 @@ import java.util.List; @Mapper public interface ProductDao { - List filterList(ProductFilterRequest productFilterRequest); + List filterList(ProductFilterRequest productFilterRequest); + + List filterProductOrder(ProductFilterRequest productFilterRequest); boolean insertProduct(AddProductRequest productOrderEntity); + boolean addProduct(ProductOrderEntity productOrderEntity); + boolean insertProductList(@Param("productOrderEntities") List productOrderEntities); boolean deleteById(@Param("id") String id); diff --git a/api-udims/src/main/java/com/glxp/udi/admin/dao/receipt/ProductInfoDao.java b/api-udims/src/main/java/com/glxp/udi/admin/dao/receipt/ProductInfoDao.java index 83b1bf2..28ae275 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/dao/receipt/ProductInfoDao.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/dao/receipt/ProductInfoDao.java @@ -1,5 +1,7 @@ package com.glxp.udi.admin.dao.receipt; +import com.glxp.udi.admin.entity.inout.ErpDetailCodeEntity; +import com.glxp.udi.admin.entity.inout.OrderDetailEntity; import com.glxp.udi.admin.entity.receipt.ProductInfoEntity; import com.glxp.udi.admin.req.receipt.ProductInfoFilterRequest; import com.glxp.udi.admin.res.inout.ProductInfoResponse; @@ -12,18 +14,33 @@ import java.util.List; public interface ProductInfoDao { List filterList(ProductInfoFilterRequest productInfoFilterRequest); + List filterDrugList(ProductInfoFilterRequest productInfoFilterRequest); + + List filterDrugListByUuid(ProductInfoFilterRequest productInfoFilterRequest); + List filterUdiList(ProductInfoFilterRequest productInfoFilterRequest); boolean insertProductInfo(ProductInfoEntity productInfoEntity); boolean deleteById(@Param("id") String id); + boolean deleteAll(@Param("ids") List ids); + ProductInfoEntity selectById(@Param("id") String id); boolean updateProductInfo(ProductInfoEntity productInfoEntity); + boolean updateUseDy(ProductInfoEntity productInfoEntity); + + + List findByCodes(@Param("coedes") List codes); + + String isExit(@Param("nameCode") String nameCode); + ErpDetailCodeEntity getDetailCode(@Param("code") String code); + ErpDetailCodeEntity getDetailCodeNoBh(@Param("code") String code); + List findNameCodeByGid(@Param("goodsId") String goodsId); } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/dao/receipt/ReceiptsdDetailDao.java b/api-udims/src/main/java/com/glxp/udi/admin/dao/receipt/ReceiptsdDetailDao.java index c10763f..3172824 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/dao/receipt/ReceiptsdDetailDao.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/dao/receipt/ReceiptsdDetailDao.java @@ -12,5 +12,5 @@ public interface ReceiptsdDetailDao { List findById(ReceiptDetailRequest receiptDetailRequest); - boolean insertReceiptsDetails(@Param("receiptsdDetailEntities")List receiptsdDetailEntities); + boolean insertReceiptsDetails(@Param("receiptsdDetailEntities") List receiptsdDetailEntities); } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/entity/info/SetupEntity.java b/api-udims/src/main/java/com/glxp/udi/admin/entity/info/SetupEntity.java new file mode 100644 index 0000000..36d4eb1 --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/entity/info/SetupEntity.java @@ -0,0 +1,27 @@ +package com.glxp.udi.admin.entity.info; + +import lombok.Data; + +@Data +public class SetupEntity { + + private int id; + private boolean erpSaleOutModify; + private boolean erpGetSaleOut; + private boolean erpSaleOutSign; + private boolean filterSaleOutSign; + private int erpGetSaleOutDay; + + private boolean erpPruchaseModify; + private boolean erpGetPurchaseIn; + private boolean erpPruchaseSign; + private int erpGetPurchaseDay; + private boolean filterPurchaseSign; + private String remark; + private boolean forbidSameErp; + + private boolean returnWareHouseOut; + private boolean salesWareHouseOut; + private boolean returnWareHouseIn; + private boolean updateErpData; +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/BussinessTypeEntity.java b/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/BussinessTypeEntity.java new file mode 100644 index 0000000..ec3854d --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/BussinessTypeEntity.java @@ -0,0 +1,14 @@ +package com.glxp.udi.admin.entity.inout; + +import lombok.Data; + +@Data +public class BussinessTypeEntity { + private Integer id; + private String thirdId; + private String udiwmsType; + private String thirdType; + private String remark; + + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/ErpDetailCodeEntity.java b/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/ErpDetailCodeEntity.java new file mode 100644 index 0000000..a223afb --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/ErpDetailCodeEntity.java @@ -0,0 +1,21 @@ +package com.glxp.udi.admin.entity.inout; + +import lombok.Data; + +@Data +public class ErpDetailCodeEntity { + private String nameCode; + private String packRatio; + private String packSpec; + private String authCode; + private String coName; + private String unit; + private int bhzxxsbzsl; + private int zxxsbzbhsydysl; + private int isUseDy; + private String batchNo; + private String code; + private int count; + private String thirdProductNo; + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/ErpOrderEntity.java b/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/ErpOrderEntity.java new file mode 100644 index 0000000..0ea07c5 --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/ErpOrderEntity.java @@ -0,0 +1,55 @@ +package com.glxp.udi.admin.entity.inout; + +import lombok.Data; + +@Data +public class ErpOrderEntity { + + + /** + * companyid : 31443 + * docid : 200959 + * iodtlid : 1108752 + * inoutid : 1064084 + * credate : 2020-10-14 10:24:56.0 + * goodsunit : 瓶 + * goodsid : 26 + * lotid : 84392 + * goodsname : 川贝清肺糖浆（120ml） + * companyname : 安徽阜阳医药集团有限公司 + * lotno : 1912198 + * dtlgoodsqty : 4000 + */ + + private long id; + private String companyid; + private String docid; + private String iodtlid; + private String inoutid; + private String goodsunit; + private String goodsid; + private String lotid; + private String goodsname; + private String companyname; + private String lotno; + private int dtlgoodsqty; + private String credate; + private int reCount; + + + private String nameCode; + private String productCompany; + private String coName; + private String authCode; + private String packSpec; + private String packRatio; + private int bhzxxsbzsl; + private int zxxsbzbhsydysl; + private String isDownload; + private String orderIdFk; + private int count; + private String nameCodes; + private String status; + + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/OrderDetailEntity.java b/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/OrderDetailEntity.java new file mode 100644 index 0000000..3340c72 --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/OrderDetailEntity.java @@ -0,0 +1,34 @@ +package com.glxp.udi.admin.entity.inout; + +import lombok.Data; + +@Data +public class OrderDetailEntity { + + private String id; + private String nameCode; + private String packRatio; + private String packLevel; + private int bhxjsl; + private int bhzxxsbzsl; + + private String bhxjcpbm; + private String bzcj; + private String thirdProductNo; + private String addType; + private String deviceRecordKey; + private String type; + private String unit; + private String coName; + private String form; + private String formSpec; + private String packSpec; + private String authCode; + private String name; + private String uuid; + private int count; + private int zxxsbzbhsydysl; + private int isUseDy; + + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/OrderEntity.java b/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/OrderEntity.java index cf5c079..2003627 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/OrderEntity.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/OrderEntity.java @@ -16,4 +16,10 @@ public class OrderEntity { private String status; private String remark; private String exportStatus; + private String fromType; + private String contrastStatus; + private String erpFk; + private String signStatus; + private String stockCheckFk; + private Long customerId; } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/TraceUploadEntity.java b/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/TraceUploadEntity.java new file mode 100644 index 0000000..9dd8eda --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/TraceUploadEntity.java @@ -0,0 +1,132 @@ +package com.glxp.udi.admin.entity.inout; + +import lombok.Data; + +@Data +public class TraceUploadEntity { + + /** + * udiCode : udi + * documentsDate : 1619022931000 + * documentsType : type + * corpName : 企业名称A + * fromCorp : 往来单位B + * productionCorp : 生产企业C + * productName : 产品名称EEE + * specifications : a12345 + * batchNo : b54321 + * productionDate : 1619123931000 + * expireDate : 1619323931000 + * count : 100 + */ + + private String udiCode; + private String documentsDate; + private String documentsType; + private String corpName; + private String fromCorp; + private String productionCorp; + private String productName; + private String specifications; + private String batchNo; + private String productionDate; + private String expireDate; + private int count; + private String creditNum; + + public String getUdiCode() { + return udiCode; + } + + public void setUdiCode(String udiCode) { + this.udiCode = udiCode; + } + + public String getDocumentsDate() { + return documentsDate; + } + + public void setDocumentsDate(String documentsDate) { + this.documentsDate = documentsDate; + } + + public String getDocumentsType() { + return documentsType; + } + + public void setDocumentsType(String documentsType) { + this.documentsType = documentsType; + } + + public String getCorpName() { + return corpName; + } + + public void setCorpName(String corpName) { + this.corpName = corpName; + } + + public String getFromCorp() { + return fromCorp; + } + + public void setFromCorp(String fromCorp) { + this.fromCorp = fromCorp; + } + + public String getProductionCorp() { + return productionCorp; + } + + public void setProductionCorp(String productionCorp) { + this.productionCorp = productionCorp; + } + + public String getProductName() { + return productName; + } + + public void setProductName(String productName) { + this.productName = productName; + } + + public String getSpecifications() { + return specifications; + } + + public void setSpecifications(String specifications) { + this.specifications = specifications; + } + + public String getBatchNo() { + return batchNo; + } + + public void setBatchNo(String batchNo) { + this.batchNo = batchNo; + } + + public String getProductionDate() { + return productionDate; + } + + public void setProductionDate(String productionDate) { + this.productionDate = productionDate; + } + + public String getExpireDate() { + return expireDate; + } + + public void setExpireDate(String expireDate) { + this.expireDate = expireDate; + } + + public int getCount() { + return count; + } + + public void setCount(int count) { + this.count = count; + } +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/UdiInfoEntity.java b/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/UdiInfoEntity.java new file mode 100644 index 0000000..83a8415 --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/UdiInfoEntity.java @@ -0,0 +1,342 @@ +package com.glxp.udi.admin.entity.inout; + +public class UdiInfoEntity { + private Integer id; + private String nameCode; + private String packRatio; + private String packLevel; + private Integer bhxjsl; + private Integer bhzxxsbzsl; + private Integer zxxsbzbhsydysl; + private String bhxjcpbm; + private String sjcpbm; // + private String bzcj; + private String addType; + private String deviceRecordKey; + private Integer isUseDy; + 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 ylqxzcrbarywmc; + private String sydycpbs; + private String uuid; + private Integer versionNumber; + private Integer diType; + private String thirdId; + private String thirdName; + private String customerId; + + + //本地生成信息 + private String batchNo; + private String produceDate; + private String expireDate; + private String serialNo; + private String udi; + private String code; + private Integer count; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getNameCode() { + return nameCode; + } + + public void setNameCode(String nameCode) { + this.nameCode = nameCode; + } + + public String getPackRatio() { + return packRatio; + } + + public void setPackRatio(String packRatio) { + this.packRatio = packRatio; + } + + public String getPackLevel() { + return packLevel; + } + + public void setPackLevel(String packLevel) { + this.packLevel = packLevel; + } + + public Integer getBhxjsl() { + if (bhxjsl == null || bhxjsl == 0) { + return 1; + } + return bhxjsl; + } + + public void setBhxjsl(Integer bhxjsl) { + this.bhxjsl = bhxjsl; + } + + public Integer getBhzxxsbzsl() { + if (bhzxxsbzsl == null || bhzxxsbzsl == 0) { + return 1; + } + return bhzxxsbzsl; + } + + public void setBhzxxsbzsl(Integer bhzxxsbzsl) { + this.bhzxxsbzsl = bhzxxsbzsl; + } + + public Integer getZxxsbzbhsydysl() { + if (zxxsbzbhsydysl == null || zxxsbzbhsydysl == 0) { + return 1; + } + return zxxsbzbhsydysl; + } + + public void setZxxsbzbhsydysl(Integer zxxsbzbhsydysl) { + this.zxxsbzbhsydysl = zxxsbzbhsydysl; + } + + public String getBhxjcpbm() { + return bhxjcpbm; + } + + public void setBhxjcpbm(String bhxjcpbm) { + this.bhxjcpbm = bhxjcpbm; + } + + public String getSjcpbm() { + return sjcpbm; + } + + public void setSjcpbm(String sjcpbm) { + this.sjcpbm = sjcpbm; + } + + public String getBzcj() { + return bzcj; + } + + public void setBzcj(String bzcj) { + this.bzcj = bzcj; + } + + public String getAddType() { + return addType; + } + + public void setAddType(String addType) { + this.addType = addType; + } + + public String getDeviceRecordKey() { + return deviceRecordKey; + } + + public void setDeviceRecordKey(String deviceRecordKey) { + this.deviceRecordKey = deviceRecordKey; + } + + public int getIsUseDy() { + return isUseDy; + } + + public void setIsUseDy(int isUseDy) { + this.isUseDy = isUseDy; + } + + 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 getYlqxzcrbarywmc() { + return ylqxzcrbarywmc; + } + + public void setYlqxzcrbarywmc(String ylqxzcrbarywmc) { + this.ylqxzcrbarywmc = ylqxzcrbarywmc; + } + + public String getSydycpbs() { + return sydycpbs; + } + + public void setSydycpbs(String sydycpbs) { + this.sydycpbs = sydycpbs; + } + + public String getUuid() { + return uuid; + } + + public void setUuid(String uuid) { + this.uuid = uuid; + } + + 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 getThirdId() { + return thirdId; + } + + public void setThirdId(String thirdId) { + this.thirdId = thirdId; + } + + public String getThirdName() { + return thirdName; + } + + public void setThirdName(String thirdName) { + this.thirdName = thirdName; + } + + public String getBatchNo() { + return batchNo; + } + + public void setBatchNo(String batchNo) { + this.batchNo = batchNo; + } + + public String getProduceDate() { + return produceDate; + } + + public void setProduceDate(String produceDate) { + this.produceDate = produceDate; + } + + public String getExpireDate() { + return expireDate; + } + + public void setExpireDate(String expireDate) { + this.expireDate = expireDate; + } + + public String getSerialNo() { + return serialNo; + } + + public void setSerialNo(String serialNo) { + this.serialNo = serialNo; + } + + public String getUdi() { + return udi; + } + + public void setUdi(String udi) { + this.udi = udi; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public Integer getCount() { + if (count == null) + return 1; + return count; + } + + public void setCount(Integer count) { + this.count = count; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/UdiRelevanceEntity.java b/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/UdiRelevanceEntity.java new file mode 100644 index 0000000..df33f70 --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/UdiRelevanceEntity.java @@ -0,0 +1,17 @@ +package com.glxp.udi.admin.entity.inout; + +import lombok.Data; + +@Data +public class UdiRelevanceEntity { + + private String id; + private String thirdId; + private String thirdName; + private String uuid; + private Boolean isUseDy; + private String updateTime; + private String batchNo; + private String warehouseName; + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/entity/receipt/UnitMaintainEntity.java b/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/UnitMaintainEntity.java similarity index 72% rename from api-udims/src/main/java/com/glxp/udi/admin/entity/receipt/UnitMaintainEntity.java rename to api-udims/src/main/java/com/glxp/udi/admin/entity/inout/UnitMaintainEntity.java index ec25362..dfd03ab 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/entity/receipt/UnitMaintainEntity.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/UnitMaintainEntity.java @@ -1,4 +1,4 @@ -package com.glxp.udi.admin.entity.receipt; +package com.glxp.udi.admin.entity.inout; import lombok.Data; @@ -13,5 +13,7 @@ public class UnitMaintainEntity { private String addr; private String status; private String type; + private String customerId; + private String creditNo; } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/WarehouseEntity.java b/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/WarehouseEntity.java index bea13f5..594ca17 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/WarehouseEntity.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/WarehouseEntity.java @@ -11,10 +11,10 @@ public class WarehouseEntity { private String corpOrderId; private String actor; private String actDate; - private int wrongCode; + private Integer wrongCode; private String upperCorpOrderId; - private String fromCorpID; - private long id; + private String fromCorpId; + private Long id; private String fromCorp; private String orderId; private String batchNo; @@ -23,7 +23,8 @@ public class WarehouseEntity { private String serialNo; private String udi; private Integer count; - private int type; - private int oddCount; + private Integer type; + private Long customerId; + } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/Warehousetemp.java b/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/Warehousetemp.java new file mode 100644 index 0000000..1dba2ba --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/Warehousetemp.java @@ -0,0 +1,201 @@ +package com.glxp.udi.admin.entity.inout; + +public class Warehousetemp { + private Long id; + + private String action; + + private String mainaction; + + private String code; + + private String corporderid; + + private String actor; + + private String actdate; + + private Integer wrongcode; + + private String uppercorporderid; + + private String fromcorpid; + + private String fromcorp; + + private String orderid; + + private String batchno; + + private String producedate; + + private String expiredate; + + private String serialno; + + private String udi; + + private Integer count; + private Integer type; + private Long customerId; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getAction() { + return action; + } + + public void setAction(String action) { + this.action = action == null ? null : action.trim(); + } + + public String getMainaction() { + return mainaction; + } + + public void setMainaction(String mainaction) { + this.mainaction = mainaction == null ? null : mainaction.trim(); + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code == null ? null : code.trim(); + } + + public String getCorporderid() { + return corporderid; + } + + public void setCorporderid(String corporderid) { + this.corporderid = corporderid == null ? null : corporderid.trim(); + } + + public String getActor() { + return actor; + } + + public void setActor(String actor) { + this.actor = actor == null ? null : actor.trim(); + } + + public String getActdate() { + return actdate; + } + + public void setActdate(String actdate) { + this.actdate = actdate == null ? null : actdate.trim(); + } + + public Integer getWrongcode() { + return wrongcode; + } + + public void setWrongcode(Integer wrongcode) { + this.wrongcode = wrongcode; + } + + public String getUppercorporderid() { + return uppercorporderid; + } + + public void setUppercorporderid(String uppercorporderid) { + this.uppercorporderid = uppercorporderid == null ? null : uppercorporderid.trim(); + } + + public String getFromcorpid() { + return fromcorpid; + } + + public void setFromcorpid(String fromcorpid) { + this.fromcorpid = fromcorpid == null ? null : fromcorpid.trim(); + } + + public String getFromcorp() { + return fromcorp; + } + + public void setFromcorp(String fromcorp) { + this.fromcorp = fromcorp == null ? null : fromcorp.trim(); + } + + public String getOrderid() { + return orderid; + } + + public void setOrderid(String orderid) { + this.orderid = orderid == null ? null : orderid.trim(); + } + + public String getBatchno() { + return batchno; + } + + public void setBatchno(String batchno) { + this.batchno = batchno == null ? null : batchno.trim(); + } + + public String getProducedate() { + return producedate; + } + + public void setProducedate(String producedate) { + this.producedate = producedate == null ? null : producedate.trim(); + } + + public String getExpiredate() { + return expiredate; + } + + public void setExpiredate(String expiredate) { + this.expiredate = expiredate == null ? null : expiredate.trim(); + } + + public String getSerialno() { + return serialno; + } + + public void setSerialno(String serialno) { + this.serialno = serialno == null ? null : serialno.trim(); + } + + public String getUdi() { + return udi; + } + + public void setUdi(String udi) { + this.udi = udi == null ? null : udi.trim(); + } + + public Integer getCount() { + return count; + } + + public void setCount(Integer count) { + this.count = count; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public Long getCustomerId() { + return customerId; + } + + public void setCustomerId(Long customerId) { + this.customerId = customerId; + } +} \ No newline at end of file diff --git a/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/WarehousetempEntity.java b/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/WarehousetempEntity.java index 073e414..e629701 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/WarehousetempEntity.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/WarehousetempEntity.java @@ -25,4 +25,5 @@ public class WarehousetempEntity { private Integer count; private int type; private int oddCount; + private Long customerId; } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/WarehousetempExample.java b/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/WarehousetempExample.java new file mode 100644 index 0000000..3174972 --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/entity/inout/WarehousetempExample.java @@ -0,0 +1,1429 @@ +package com.glxp.udi.admin.entity.inout; + +import java.util.ArrayList; +import java.util.List; + +public class WarehousetempExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public WarehousetempExample() { + oredCriteria = new ArrayList<>(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList<>(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andActionIsNull() { + addCriterion("action is null"); + return (Criteria) this; + } + + public Criteria andActionIsNotNull() { + addCriterion("action is not null"); + return (Criteria) this; + } + + public Criteria andActionEqualTo(String value) { + addCriterion("action =", value, "action"); + return (Criteria) this; + } + + public Criteria andActionNotEqualTo(String value) { + addCriterion("action <>", value, "action"); + return (Criteria) this; + } + + public Criteria andActionGreaterThan(String value) { + addCriterion("action >", value, "action"); + return (Criteria) this; + } + + public Criteria andActionGreaterThanOrEqualTo(String value) { + addCriterion("action >=", value, "action"); + return (Criteria) this; + } + + public Criteria andActionLessThan(String value) { + addCriterion("action <", value, "action"); + return (Criteria) this; + } + + public Criteria andActionLessThanOrEqualTo(String value) { + addCriterion("action <=", value, "action"); + return (Criteria) this; + } + + public Criteria andActionLike(String value) { + addCriterion("action like", value, "action"); + return (Criteria) this; + } + + public Criteria andActionNotLike(String value) { + addCriterion("action not like", value, "action"); + return (Criteria) this; + } + + public Criteria andActionIn(List values) { + addCriterion("action in", values, "action"); + return (Criteria) this; + } + + public Criteria andActionNotIn(List values) { + addCriterion("action not in", values, "action"); + return (Criteria) this; + } + + public Criteria andActionBetween(String value1, String value2) { + addCriterion("action between", value1, value2, "action"); + return (Criteria) this; + } + + public Criteria andActionNotBetween(String value1, String value2) { + addCriterion("action not between", value1, value2, "action"); + return (Criteria) this; + } + + public Criteria andMainactionIsNull() { + addCriterion("mainAction is null"); + return (Criteria) this; + } + + public Criteria andMainactionIsNotNull() { + addCriterion("mainAction is not null"); + return (Criteria) this; + } + + public Criteria andMainactionEqualTo(String value) { + addCriterion("mainAction =", value, "mainaction"); + return (Criteria) this; + } + + public Criteria andMainactionNotEqualTo(String value) { + addCriterion("mainAction <>", value, "mainaction"); + return (Criteria) this; + } + + public Criteria andMainactionGreaterThan(String value) { + addCriterion("mainAction >", value, "mainaction"); + return (Criteria) this; + } + + public Criteria andMainactionGreaterThanOrEqualTo(String value) { + addCriterion("mainAction >=", value, "mainaction"); + return (Criteria) this; + } + + public Criteria andMainactionLessThan(String value) { + addCriterion("mainAction <", value, "mainaction"); + return (Criteria) this; + } + + public Criteria andMainactionLessThanOrEqualTo(String value) { + addCriterion("mainAction <=", value, "mainaction"); + return (Criteria) this; + } + + public Criteria andMainactionLike(String value) { + addCriterion("mainAction like", value, "mainaction"); + return (Criteria) this; + } + + public Criteria andMainactionNotLike(String value) { + addCriterion("mainAction not like", value, "mainaction"); + return (Criteria) this; + } + + public Criteria andMainactionIn(List values) { + addCriterion("mainAction in", values, "mainaction"); + return (Criteria) this; + } + + public Criteria andMainactionNotIn(List values) { + addCriterion("mainAction not in", values, "mainaction"); + return (Criteria) this; + } + + public Criteria andMainactionBetween(String value1, String value2) { + addCriterion("mainAction between", value1, value2, "mainaction"); + return (Criteria) this; + } + + public Criteria andMainactionNotBetween(String value1, String value2) { + addCriterion("mainAction not between", value1, value2, "mainaction"); + return (Criteria) this; + } + + public Criteria andCodeIsNull() { + addCriterion("code is null"); + return (Criteria) this; + } + + public Criteria andCodeIsNotNull() { + addCriterion("code is not null"); + return (Criteria) this; + } + + public Criteria andCodeEqualTo(String value) { + addCriterion("code =", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotEqualTo(String value) { + addCriterion("code <>", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeGreaterThan(String value) { + addCriterion("code >", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeGreaterThanOrEqualTo(String value) { + addCriterion("code >=", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLessThan(String value) { + addCriterion("code <", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLessThanOrEqualTo(String value) { + addCriterion("code <=", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLike(String value) { + addCriterion("code like", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotLike(String value) { + addCriterion("code not like", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeIn(List values) { + addCriterion("code in", values, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotIn(List values) { + addCriterion("code not in", values, "code"); + return (Criteria) this; + } + + public Criteria andCodeBetween(String value1, String value2) { + addCriterion("code between", value1, value2, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotBetween(String value1, String value2) { + addCriterion("code not between", value1, value2, "code"); + return (Criteria) this; + } + + public Criteria andCorporderidIsNull() { + addCriterion("corpOrderId is null"); + return (Criteria) this; + } + + public Criteria andCorporderidIsNotNull() { + addCriterion("corpOrderId is not null"); + return (Criteria) this; + } + + public Criteria andCorporderidEqualTo(String value) { + addCriterion("corpOrderId =", value, "corporderid"); + return (Criteria) this; + } + + public Criteria andCorporderidNotEqualTo(String value) { + addCriterion("corpOrderId <>", value, "corporderid"); + return (Criteria) this; + } + + public Criteria andCorporderidGreaterThan(String value) { + addCriterion("corpOrderId >", value, "corporderid"); + return (Criteria) this; + } + + public Criteria andCorporderidGreaterThanOrEqualTo(String value) { + addCriterion("corpOrderId >=", value, "corporderid"); + return (Criteria) this; + } + + public Criteria andCorporderidLessThan(String value) { + addCriterion("corpOrderId <", value, "corporderid"); + return (Criteria) this; + } + + public Criteria andCorporderidLessThanOrEqualTo(String value) { + addCriterion("corpOrderId <=", value, "corporderid"); + return (Criteria) this; + } + + public Criteria andCorporderidLike(String value) { + addCriterion("corpOrderId like", value, "corporderid"); + return (Criteria) this; + } + + public Criteria andCorporderidNotLike(String value) { + addCriterion("corpOrderId not like", value, "corporderid"); + return (Criteria) this; + } + + public Criteria andCorporderidIn(List values) { + addCriterion("corpOrderId in", values, "corporderid"); + return (Criteria) this; + } + + public Criteria andCorporderidNotIn(List values) { + addCriterion("corpOrderId not in", values, "corporderid"); + return (Criteria) this; + } + + public Criteria andCorporderidBetween(String value1, String value2) { + addCriterion("corpOrderId between", value1, value2, "corporderid"); + return (Criteria) this; + } + + public Criteria andCorporderidNotBetween(String value1, String value2) { + addCriterion("corpOrderId not between", value1, value2, "corporderid"); + return (Criteria) this; + } + + public Criteria andActorIsNull() { + addCriterion("actor is null"); + return (Criteria) this; + } + + public Criteria andActorIsNotNull() { + addCriterion("actor is not null"); + return (Criteria) this; + } + + public Criteria andActorEqualTo(String value) { + addCriterion("actor =", value, "actor"); + return (Criteria) this; + } + + public Criteria andActorNotEqualTo(String value) { + addCriterion("actor <>", value, "actor"); + return (Criteria) this; + } + + public Criteria andActorGreaterThan(String value) { + addCriterion("actor >", value, "actor"); + return (Criteria) this; + } + + public Criteria andActorGreaterThanOrEqualTo(String value) { + addCriterion("actor >=", value, "actor"); + return (Criteria) this; + } + + public Criteria andActorLessThan(String value) { + addCriterion("actor <", value, "actor"); + return (Criteria) this; + } + + public Criteria andActorLessThanOrEqualTo(String value) { + addCriterion("actor <=", value, "actor"); + return (Criteria) this; + } + + public Criteria andActorLike(String value) { + addCriterion("actor like", value, "actor"); + return (Criteria) this; + } + + public Criteria andActorNotLike(String value) { + addCriterion("actor not like", value, "actor"); + return (Criteria) this; + } + + public Criteria andActorIn(List values) { + addCriterion("actor in", values, "actor"); + return (Criteria) this; + } + + public Criteria andActorNotIn(List values) { + addCriterion("actor not in", values, "actor"); + return (Criteria) this; + } + + public Criteria andActorBetween(String value1, String value2) { + addCriterion("actor between", value1, value2, "actor"); + return (Criteria) this; + } + + public Criteria andActorNotBetween(String value1, String value2) { + addCriterion("actor not between", value1, value2, "actor"); + return (Criteria) this; + } + + public Criteria andActdateIsNull() { + addCriterion("actDate is null"); + return (Criteria) this; + } + + public Criteria andActdateIsNotNull() { + addCriterion("actDate is not null"); + return (Criteria) this; + } + + public Criteria andActdateEqualTo(String value) { + addCriterion("actDate =", value, "actdate"); + return (Criteria) this; + } + + public Criteria andActdateNotEqualTo(String value) { + addCriterion("actDate <>", value, "actdate"); + return (Criteria) this; + } + + public Criteria andActdateGreaterThan(String value) { + addCriterion("actDate >", value, "actdate"); + return (Criteria) this; + } + + public Criteria andActdateGreaterThanOrEqualTo(String value) { + addCriterion("actDate >=", value, "actdate"); + return (Criteria) this; + } + + public Criteria andActdateLessThan(String value) { + addCriterion("actDate <", value, "actdate"); + return (Criteria) this; + } + + public Criteria andActdateLessThanOrEqualTo(String value) { + addCriterion("actDate <=", value, "actdate"); + return (Criteria) this; + } + + public Criteria andActdateLike(String value) { + addCriterion("actDate like", value, "actdate"); + return (Criteria) this; + } + + public Criteria andActdateNotLike(String value) { + addCriterion("actDate not like", value, "actdate"); + return (Criteria) this; + } + + public Criteria andActdateIn(List values) { + addCriterion("actDate in", values, "actdate"); + return (Criteria) this; + } + + public Criteria andActdateNotIn(List values) { + addCriterion("actDate not in", values, "actdate"); + return (Criteria) this; + } + + public Criteria andActdateBetween(String value1, String value2) { + addCriterion("actDate between", value1, value2, "actdate"); + return (Criteria) this; + } + + public Criteria andActdateNotBetween(String value1, String value2) { + addCriterion("actDate not between", value1, value2, "actdate"); + return (Criteria) this; + } + + public Criteria andWrongcodeIsNull() { + addCriterion("wrongCode is null"); + return (Criteria) this; + } + + public Criteria andWrongcodeIsNotNull() { + addCriterion("wrongCode is not null"); + return (Criteria) this; + } + + public Criteria andWrongcodeEqualTo(Integer value) { + addCriterion("wrongCode =", value, "wrongcode"); + return (Criteria) this; + } + + public Criteria andWrongcodeNotEqualTo(Integer value) { + addCriterion("wrongCode <>", value, "wrongcode"); + return (Criteria) this; + } + + public Criteria andWrongcodeGreaterThan(Integer value) { + addCriterion("wrongCode >", value, "wrongcode"); + return (Criteria) this; + } + + public Criteria andWrongcodeGreaterThanOrEqualTo(Integer value) { + addCriterion("wrongCode >=", value, "wrongcode"); + return (Criteria) this; + } + + public Criteria andWrongcodeLessThan(Integer value) { + addCriterion("wrongCode <", value, "wrongcode"); + return (Criteria) this; + } + + public Criteria andWrongcodeLessThanOrEqualTo(Integer value) { + addCriterion("wrongCode <=", value, "wrongcode"); + return (Criteria) this; + } + + public Criteria andWrongcodeIn(List values) { + addCriterion("wrongCode in", values, "wrongcode"); + return (Criteria) this; + } + + public Criteria andWrongcodeNotIn(List values) { + addCriterion("wrongCode not in", values, "wrongcode"); + return (Criteria) this; + } + + public Criteria andWrongcodeBetween(Integer value1, Integer value2) { + addCriterion("wrongCode between", value1, value2, "wrongcode"); + return (Criteria) this; + } + + public Criteria andWrongcodeNotBetween(Integer value1, Integer value2) { + addCriterion("wrongCode not between", value1, value2, "wrongcode"); + return (Criteria) this; + } + + public Criteria andUppercorporderidIsNull() { + addCriterion("upperCorpOrderId is null"); + return (Criteria) this; + } + + public Criteria andUppercorporderidIsNotNull() { + addCriterion("upperCorpOrderId is not null"); + return (Criteria) this; + } + + public Criteria andUppercorporderidEqualTo(String value) { + addCriterion("upperCorpOrderId =", value, "uppercorporderid"); + return (Criteria) this; + } + + public Criteria andUppercorporderidNotEqualTo(String value) { + addCriterion("upperCorpOrderId <>", value, "uppercorporderid"); + return (Criteria) this; + } + + public Criteria andUppercorporderidGreaterThan(String value) { + addCriterion("upperCorpOrderId >", value, "uppercorporderid"); + return (Criteria) this; + } + + public Criteria andUppercorporderidGreaterThanOrEqualTo(String value) { + addCriterion("upperCorpOrderId >=", value, "uppercorporderid"); + return (Criteria) this; + } + + public Criteria andUppercorporderidLessThan(String value) { + addCriterion("upperCorpOrderId <", value, "uppercorporderid"); + return (Criteria) this; + } + + public Criteria andUppercorporderidLessThanOrEqualTo(String value) { + addCriterion("upperCorpOrderId <=", value, "uppercorporderid"); + return (Criteria) this; + } + + public Criteria andUppercorporderidLike(String value) { + addCriterion("upperCorpOrderId like", value, "uppercorporderid"); + return (Criteria) this; + } + + public Criteria andUppercorporderidNotLike(String value) { + addCriterion("upperCorpOrderId not like", value, "uppercorporderid"); + return (Criteria) this; + } + + public Criteria andUppercorporderidIn(List values) { + addCriterion("upperCorpOrderId in", values, "uppercorporderid"); + return (Criteria) this; + } + + public Criteria andUppercorporderidNotIn(List values) { + addCriterion("upperCorpOrderId not in", values, "uppercorporderid"); + return (Criteria) this; + } + + public Criteria andUppercorporderidBetween(String value1, String value2) { + addCriterion("upperCorpOrderId between", value1, value2, "uppercorporderid"); + return (Criteria) this; + } + + public Criteria andUppercorporderidNotBetween(String value1, String value2) { + addCriterion("upperCorpOrderId not between", value1, value2, "uppercorporderid"); + return (Criteria) this; + } + + public Criteria andFromcorpidIsNull() { + addCriterion("fromCorpID is null"); + return (Criteria) this; + } + + public Criteria andFromcorpidIsNotNull() { + addCriterion("fromCorpID is not null"); + return (Criteria) this; + } + + public Criteria andFromcorpidEqualTo(String value) { + addCriterion("fromCorpID =", value, "fromcorpid"); + return (Criteria) this; + } + + public Criteria andFromcorpidNotEqualTo(String value) { + addCriterion("fromCorpID <>", value, "fromcorpid"); + return (Criteria) this; + } + + public Criteria andFromcorpidGreaterThan(String value) { + addCriterion("fromCorpID >", value, "fromcorpid"); + return (Criteria) this; + } + + public Criteria andFromcorpidGreaterThanOrEqualTo(String value) { + addCriterion("fromCorpID >=", value, "fromcorpid"); + return (Criteria) this; + } + + public Criteria andFromcorpidLessThan(String value) { + addCriterion("fromCorpID <", value, "fromcorpid"); + return (Criteria) this; + } + + public Criteria andFromcorpidLessThanOrEqualTo(String value) { + addCriterion("fromCorpID <=", value, "fromcorpid"); + return (Criteria) this; + } + + public Criteria andFromcorpidLike(String value) { + addCriterion("fromCorpID like", value, "fromcorpid"); + return (Criteria) this; + } + + public Criteria andFromcorpidNotLike(String value) { + addCriterion("fromCorpID not like", value, "fromcorpid"); + return (Criteria) this; + } + + public Criteria andFromcorpidIn(List values) { + addCriterion("fromCorpID in", values, "fromcorpid"); + return (Criteria) this; + } + + public Criteria andFromcorpidNotIn(List values) { + addCriterion("fromCorpID not in", values, "fromcorpid"); + return (Criteria) this; + } + + public Criteria andFromcorpidBetween(String value1, String value2) { + addCriterion("fromCorpID between", value1, value2, "fromcorpid"); + return (Criteria) this; + } + + public Criteria andFromcorpidNotBetween(String value1, String value2) { + addCriterion("fromCorpID not between", value1, value2, "fromcorpid"); + return (Criteria) this; + } + + public Criteria andFromcorpIsNull() { + addCriterion("fromCorp is null"); + return (Criteria) this; + } + + public Criteria andFromcorpIsNotNull() { + addCriterion("fromCorp is not null"); + return (Criteria) this; + } + + public Criteria andFromcorpEqualTo(String value) { + addCriterion("fromCorp =", value, "fromcorp"); + return (Criteria) this; + } + + public Criteria andFromcorpNotEqualTo(String value) { + addCriterion("fromCorp <>", value, "fromcorp"); + return (Criteria) this; + } + + public Criteria andFromcorpGreaterThan(String value) { + addCriterion("fromCorp >", value, "fromcorp"); + return (Criteria) this; + } + + public Criteria andFromcorpGreaterThanOrEqualTo(String value) { + addCriterion("fromCorp >=", value, "fromcorp"); + return (Criteria) this; + } + + public Criteria andFromcorpLessThan(String value) { + addCriterion("fromCorp <", value, "fromcorp"); + return (Criteria) this; + } + + public Criteria andFromcorpLessThanOrEqualTo(String value) { + addCriterion("fromCorp <=", value, "fromcorp"); + return (Criteria) this; + } + + public Criteria andFromcorpLike(String value) { + addCriterion("fromCorp like", value, "fromcorp"); + return (Criteria) this; + } + + public Criteria andFromcorpNotLike(String value) { + addCriterion("fromCorp not like", value, "fromcorp"); + return (Criteria) this; + } + + public Criteria andFromcorpIn(List values) { + addCriterion("fromCorp in", values, "fromcorp"); + return (Criteria) this; + } + + public Criteria andFromcorpNotIn(List values) { + addCriterion("fromCorp not in", values, "fromcorp"); + return (Criteria) this; + } + + public Criteria andFromcorpBetween(String value1, String value2) { + addCriterion("fromCorp between", value1, value2, "fromcorp"); + return (Criteria) this; + } + + public Criteria andFromcorpNotBetween(String value1, String value2) { + addCriterion("fromCorp not between", value1, value2, "fromcorp"); + return (Criteria) this; + } + + public Criteria andOrderidIsNull() { + addCriterion("orderId is null"); + return (Criteria) this; + } + + public Criteria andOrderidIsNotNull() { + addCriterion("orderId is not null"); + return (Criteria) this; + } + + public Criteria andOrderidEqualTo(String value) { + addCriterion("orderId =", value, "orderid"); + return (Criteria) this; + } + + public Criteria andOrderidNotEqualTo(String value) { + addCriterion("orderId <>", value, "orderid"); + return (Criteria) this; + } + + public Criteria andOrderidGreaterThan(String value) { + addCriterion("orderId >", value, "orderid"); + return (Criteria) this; + } + + public Criteria andOrderidGreaterThanOrEqualTo(String value) { + addCriterion("orderId >=", value, "orderid"); + return (Criteria) this; + } + + public Criteria andOrderidLessThan(String value) { + addCriterion("orderId <", value, "orderid"); + return (Criteria) this; + } + + public Criteria andOrderidLessThanOrEqualTo(String value) { + addCriterion("orderId <=", value, "orderid"); + return (Criteria) this; + } + + public Criteria andOrderidLike(String value) { + addCriterion("orderId like", value, "orderid"); + return (Criteria) this; + } + + public Criteria andOrderidNotLike(String value) { + addCriterion("orderId not like", value, "orderid"); + return (Criteria) this; + } + + public Criteria andOrderidIn(List values) { + addCriterion("orderId in", values, "orderid"); + return (Criteria) this; + } + + public Criteria andOrderidNotIn(List values) { + addCriterion("orderId not in", values, "orderid"); + return (Criteria) this; + } + + public Criteria andOrderidBetween(String value1, String value2) { + addCriterion("orderId between", value1, value2, "orderid"); + return (Criteria) this; + } + + public Criteria andOrderidNotBetween(String value1, String value2) { + addCriterion("orderId not between", value1, value2, "orderid"); + return (Criteria) this; + } + + public Criteria andBatchnoIsNull() { + addCriterion("batchNo is null"); + return (Criteria) this; + } + + public Criteria andBatchnoIsNotNull() { + addCriterion("batchNo is not null"); + return (Criteria) this; + } + + public Criteria andBatchnoEqualTo(String value) { + addCriterion("batchNo =", value, "batchno"); + return (Criteria) this; + } + + public Criteria andBatchnoNotEqualTo(String value) { + addCriterion("batchNo <>", value, "batchno"); + return (Criteria) this; + } + + public Criteria andBatchnoGreaterThan(String value) { + addCriterion("batchNo >", value, "batchno"); + return (Criteria) this; + } + + public Criteria andBatchnoGreaterThanOrEqualTo(String value) { + addCriterion("batchNo >=", value, "batchno"); + return (Criteria) this; + } + + public Criteria andBatchnoLessThan(String value) { + addCriterion("batchNo <", value, "batchno"); + return (Criteria) this; + } + + public Criteria andBatchnoLessThanOrEqualTo(String value) { + addCriterion("batchNo <=", value, "batchno"); + return (Criteria) this; + } + + public Criteria andBatchnoLike(String value) { + addCriterion("batchNo like", value, "batchno"); + return (Criteria) this; + } + + public Criteria andBatchnoNotLike(String value) { + addCriterion("batchNo not like", value, "batchno"); + return (Criteria) this; + } + + public Criteria andBatchnoIn(List values) { + addCriterion("batchNo in", values, "batchno"); + return (Criteria) this; + } + + public Criteria andBatchnoNotIn(List values) { + addCriterion("batchNo not in", values, "batchno"); + return (Criteria) this; + } + + public Criteria andBatchnoBetween(String value1, String value2) { + addCriterion("batchNo between", value1, value2, "batchno"); + return (Criteria) this; + } + + public Criteria andBatchnoNotBetween(String value1, String value2) { + addCriterion("batchNo not between", value1, value2, "batchno"); + return (Criteria) this; + } + + public Criteria andProducedateIsNull() { + addCriterion("produceDate is null"); + return (Criteria) this; + } + + public Criteria andProducedateIsNotNull() { + addCriterion("produceDate is not null"); + return (Criteria) this; + } + + public Criteria andProducedateEqualTo(String value) { + addCriterion("produceDate =", value, "producedate"); + return (Criteria) this; + } + + public Criteria andProducedateNotEqualTo(String value) { + addCriterion("produceDate <>", value, "producedate"); + return (Criteria) this; + } + + public Criteria andProducedateGreaterThan(String value) { + addCriterion("produceDate >", value, "producedate"); + return (Criteria) this; + } + + public Criteria andProducedateGreaterThanOrEqualTo(String value) { + addCriterion("produceDate >=", value, "producedate"); + return (Criteria) this; + } + + public Criteria andProducedateLessThan(String value) { + addCriterion("produceDate <", value, "producedate"); + return (Criteria) this; + } + + public Criteria andProducedateLessThanOrEqualTo(String value) { + addCriterion("produceDate <=", value, "producedate"); + return (Criteria) this; + } + + public Criteria andProducedateLike(String value) { + addCriterion("produceDate like", value, "producedate"); + return (Criteria) this; + } + + public Criteria andProducedateNotLike(String value) { + addCriterion("produceDate not like", value, "producedate"); + return (Criteria) this; + } + + public Criteria andProducedateIn(List values) { + addCriterion("produceDate in", values, "producedate"); + return (Criteria) this; + } + + public Criteria andProducedateNotIn(List values) { + addCriterion("produceDate not in", values, "producedate"); + return (Criteria) this; + } + + public Criteria andProducedateBetween(String value1, String value2) { + addCriterion("produceDate between", value1, value2, "producedate"); + return (Criteria) this; + } + + public Criteria andProducedateNotBetween(String value1, String value2) { + addCriterion("produceDate not between", value1, value2, "producedate"); + return (Criteria) this; + } + + public Criteria andExpiredateIsNull() { + addCriterion("expireDate is null"); + return (Criteria) this; + } + + public Criteria andExpiredateIsNotNull() { + addCriterion("expireDate is not null"); + return (Criteria) this; + } + + public Criteria andExpiredateEqualTo(String value) { + addCriterion("expireDate =", value, "expiredate"); + return (Criteria) this; + } + + public Criteria andExpiredateNotEqualTo(String value) { + addCriterion("expireDate <>", value, "expiredate"); + return (Criteria) this; + } + + public Criteria andExpiredateGreaterThan(String value) { + addCriterion("expireDate >", value, "expiredate"); + return (Criteria) this; + } + + public Criteria andExpiredateGreaterThanOrEqualTo(String value) { + addCriterion("expireDate >=", value, "expiredate"); + return (Criteria) this; + } + + public Criteria andExpiredateLessThan(String value) { + addCriterion("expireDate <", value, "expiredate"); + return (Criteria) this; + } + + public Criteria andExpiredateLessThanOrEqualTo(String value) { + addCriterion("expireDate <=", value, "expiredate"); + return (Criteria) this; + } + + public Criteria andExpiredateLike(String value) { + addCriterion("expireDate like", value, "expiredate"); + return (Criteria) this; + } + + public Criteria andExpiredateNotLike(String value) { + addCriterion("expireDate not like", value, "expiredate"); + return (Criteria) this; + } + + public Criteria andExpiredateIn(List values) { + addCriterion("expireDate in", values, "expiredate"); + return (Criteria) this; + } + + public Criteria andExpiredateNotIn(List values) { + addCriterion("expireDate not in", values, "expiredate"); + return (Criteria) this; + } + + public Criteria andExpiredateBetween(String value1, String value2) { + addCriterion("expireDate between", value1, value2, "expiredate"); + return (Criteria) this; + } + + public Criteria andExpiredateNotBetween(String value1, String value2) { + addCriterion("expireDate not between", value1, value2, "expiredate"); + return (Criteria) this; + } + + public Criteria andSerialnoIsNull() { + addCriterion("serialNo is null"); + return (Criteria) this; + } + + public Criteria andSerialnoIsNotNull() { + addCriterion("serialNo is not null"); + return (Criteria) this; + } + + public Criteria andSerialnoEqualTo(String value) { + addCriterion("serialNo =", value, "serialno"); + return (Criteria) this; + } + + public Criteria andSerialnoNotEqualTo(String value) { + addCriterion("serialNo <>", value, "serialno"); + return (Criteria) this; + } + + public Criteria andSerialnoGreaterThan(String value) { + addCriterion("serialNo >", value, "serialno"); + return (Criteria) this; + } + + public Criteria andSerialnoGreaterThanOrEqualTo(String value) { + addCriterion("serialNo >=", value, "serialno"); + return (Criteria) this; + } + + public Criteria andSerialnoLessThan(String value) { + addCriterion("serialNo <", value, "serialno"); + return (Criteria) this; + } + + public Criteria andSerialnoLessThanOrEqualTo(String value) { + addCriterion("serialNo <=", value, "serialno"); + return (Criteria) this; + } + + public Criteria andSerialnoLike(String value) { + addCriterion("serialNo like", value, "serialno"); + return (Criteria) this; + } + + public Criteria andSerialnoNotLike(String value) { + addCriterion("serialNo not like", value, "serialno"); + return (Criteria) this; + } + + public Criteria andSerialnoIn(List values) { + addCriterion("serialNo in", values, "serialno"); + return (Criteria) this; + } + + public Criteria andSerialnoNotIn(List values) { + addCriterion("serialNo not in", values, "serialno"); + return (Criteria) this; + } + + public Criteria andSerialnoBetween(String value1, String value2) { + addCriterion("serialNo between", value1, value2, "serialno"); + return (Criteria) this; + } + + public Criteria andSerialnoNotBetween(String value1, String value2) { + addCriterion("serialNo not between", value1, value2, "serialno"); + return (Criteria) this; + } + + public Criteria andUdiIsNull() { + addCriterion("udi is null"); + return (Criteria) this; + } + + public Criteria andUdiIsNotNull() { + addCriterion("udi is not null"); + return (Criteria) this; + } + + public Criteria andUdiEqualTo(String value) { + addCriterion("udi =", value, "udi"); + return (Criteria) this; + } + + public Criteria andUdiNotEqualTo(String value) { + addCriterion("udi <>", value, "udi"); + return (Criteria) this; + } + + public Criteria andUdiGreaterThan(String value) { + addCriterion("udi >", value, "udi"); + return (Criteria) this; + } + + public Criteria andUdiGreaterThanOrEqualTo(String value) { + addCriterion("udi >=", value, "udi"); + return (Criteria) this; + } + + public Criteria andUdiLessThan(String value) { + addCriterion("udi <", value, "udi"); + return (Criteria) this; + } + + public Criteria andUdiLessThanOrEqualTo(String value) { + addCriterion("udi <=", value, "udi"); + return (Criteria) this; + } + + public Criteria andUdiLike(String value) { + addCriterion("udi like", value, "udi"); + return (Criteria) this; + } + + public Criteria andUdiNotLike(String value) { + addCriterion("udi not like", value, "udi"); + return (Criteria) this; + } + + public Criteria andUdiIn(List values) { + addCriterion("udi in", values, "udi"); + return (Criteria) this; + } + + public Criteria andUdiNotIn(List values) { + addCriterion("udi not in", values, "udi"); + return (Criteria) this; + } + + public Criteria andUdiBetween(String value1, String value2) { + addCriterion("udi between", value1, value2, "udi"); + return (Criteria) this; + } + + public Criteria andUdiNotBetween(String value1, String value2) { + addCriterion("udi not between", value1, value2, "udi"); + return (Criteria) this; + } + + public Criteria andCountIsNull() { + addCriterion("count is null"); + return (Criteria) this; + } + + public Criteria andCountIsNotNull() { + addCriterion("count is not null"); + return (Criteria) this; + } + + public Criteria andCountEqualTo(Integer value) { + addCriterion("count =", value, "count"); + return (Criteria) this; + } + + public Criteria andCountNotEqualTo(Integer value) { + addCriterion("count <>", value, "count"); + return (Criteria) this; + } + + public Criteria andCountGreaterThan(Integer value) { + addCriterion("count >", value, "count"); + return (Criteria) this; + } + + public Criteria andCountGreaterThanOrEqualTo(Integer value) { + addCriterion("count >=", value, "count"); + return (Criteria) this; + } + + public Criteria andCountLessThan(Integer value) { + addCriterion("count <", value, "count"); + return (Criteria) this; + } + + public Criteria andCountLessThanOrEqualTo(Integer value) { + addCriterion("count <=", value, "count"); + return (Criteria) this; + } + + public Criteria andCountIn(List values) { + addCriterion("count in", values, "count"); + return (Criteria) this; + } + + public Criteria andCountNotIn(List values) { + addCriterion("count not in", values, "count"); + return (Criteria) this; + } + + public Criteria andCountBetween(Integer value1, Integer value2) { + addCriterion("count between", value1, value2, "count"); + return (Criteria) this; + } + + public Criteria andCountNotBetween(Integer value1, Integer value2) { + addCriterion("count not between", value1, value2, "count"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/api-udims/src/main/java/com/glxp/udi/admin/entity/receipt/ProductOrderDetailEntity.java b/api-udims/src/main/java/com/glxp/udi/admin/entity/receipt/ProductOrderDetailEntity.java new file mode 100644 index 0000000..e4d5338 --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/entity/receipt/ProductOrderDetailEntity.java @@ -0,0 +1,35 @@ +package com.glxp.udi.admin.entity.receipt; + +import lombok.Data; + +@Data +public class ProductOrderDetailEntity { + + private int id; + private String udi; + private String orderNo; + private String batchNo; + private String manufacturingDate; + private String expirationDate; + private int closeFlag; + private String comments; + private int count; + private String dlstaus; + private int fromType; + + private String orderId;//查询用 + + private String type; + private String unit; + private String coName; + private String form; + private String formSpec; + private String packSpec; + private String authCode; + private String name; + private String nameCode; + private String packRatio; + private String packLevel; + private String uuid; + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/entity/receipt/StockDetailEntity.java b/api-udims/src/main/java/com/glxp/udi/admin/entity/receipt/StockDetailEntity.java new file mode 100644 index 0000000..da73901 --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/entity/receipt/StockDetailEntity.java @@ -0,0 +1,33 @@ +package com.glxp.udi.admin.entity.receipt; + +import lombok.Data; + +@Data +public class StockDetailEntity { + + private String orderId; + private String code; + private String pCode; + private String packFlag; + private String codeLevel; + private String batchNo; + private String manufacturingDate; + private String expirationDate; + private String closeFlag; + private String count; + private String lastModifyTime; + private String type; + private String unit; + private String coName; + private String form; + private String formSpec; + private String packSpec; + private String authCode; + private String name; + private String nameCode; + private String packRatio; + private String packLevel; + private String uuid; + private String minCount; + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/req/info/FilterSetupRequest.java b/api-udims/src/main/java/com/glxp/udi/admin/req/info/FilterSetupRequest.java new file mode 100644 index 0000000..1d05d62 --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/req/info/FilterSetupRequest.java @@ -0,0 +1,12 @@ +package com.glxp.udi.admin.req.info; + +import lombok.Data; + +@Data +public class FilterSetupRequest { + + private int id; + private String erpSign; + private String erpSaleOutModify; + private String erpPruchaseModify; +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/req/inout/FilterErpOrderRequest.java b/api-udims/src/main/java/com/glxp/udi/admin/req/inout/FilterErpOrderRequest.java new file mode 100644 index 0000000..181413a --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/req/inout/FilterErpOrderRequest.java @@ -0,0 +1,23 @@ +package com.glxp.udi.admin.req.inout; + +import com.glxp.udi.admin.req.ListPageRequest; +import lombok.Data; + +import java.util.List; + +@Data +public class FilterErpOrderRequest extends ListPageRequest { + + private String docid; + private String goodsname; + private String companyname; + private String orderId; + private String orderIdFk; + private String startDate; + private String endDate; + private String billAction; + private String billcode; + private String fbillflag; + List orderIds; + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/req/inout/FilterUdiInfoRequest.java b/api-udims/src/main/java/com/glxp/udi/admin/req/inout/FilterUdiInfoRequest.java new file mode 100644 index 0000000..1f17205 --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/req/inout/FilterUdiInfoRequest.java @@ -0,0 +1,17 @@ +package com.glxp.udi.admin.req.inout; + +import com.glxp.udi.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterUdiInfoRequest extends ListPageRequest { + + private String ylqxzcrbarmc; + private String cpmctymc; + private String nameCode; + private String uuid; + private String ggxh; + private String thirdId; + private String customerId; + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/req/inout/FilterWarehouseRequest.java b/api-udims/src/main/java/com/glxp/udi/admin/req/inout/FilterWarehouseRequest.java new file mode 100644 index 0000000..074821e --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/req/inout/FilterWarehouseRequest.java @@ -0,0 +1,10 @@ +package com.glxp.udi.admin.req.inout; + +import lombok.Data; + +@Data +public class FilterWarehouseRequest { + + private String code; + private Long customerId; +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/req/inout/OrderFilterRequest.java b/api-udims/src/main/java/com/glxp/udi/admin/req/inout/OrderFilterRequest.java index 3f7a785..53674f0 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/req/inout/OrderFilterRequest.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/req/inout/OrderFilterRequest.java @@ -11,5 +11,13 @@ public class OrderFilterRequest extends ListPageRequest { private String mainAction; private String code; private String exportStatus; + private String status; + private String corpOrderId; + private String contrastStatus; + private String signStatus; + private String startTime; + private String endTime; + private String stockCheckFk; + private Long customerId; } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/req/inout/PostErpOrderRequest.java b/api-udims/src/main/java/com/glxp/udi/admin/req/inout/PostErpOrderRequest.java new file mode 100644 index 0000000..a276434 --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/req/inout/PostErpOrderRequest.java @@ -0,0 +1,14 @@ +package com.glxp.udi.admin.req.inout; + +import com.glxp.udi.admin.entity.inout.ErpOrderEntity; +import com.glxp.udi.admin.entity.inout.WarehouseEntity; +import lombok.Data; + +import java.util.List; + +@Data +public class PostErpOrderRequest { + public List erpOrderEntities; + List codes; + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/req/inout/PostOrderRequest.java b/api-udims/src/main/java/com/glxp/udi/admin/req/inout/PostOrderRequest.java new file mode 100644 index 0000000..a04173d --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/req/inout/PostOrderRequest.java @@ -0,0 +1,69 @@ +package com.glxp.udi.admin.req.inout; + +import com.glxp.udi.admin.entity.inout.WarehouseEntity; +import lombok.Data; + +import java.util.List; + +@Data +public class PostOrderRequest { + List postOrders; + + public List getPostOrder() { + return postOrders; + } + + public void setPostOrder(List postOrder) { + this.postOrders = postOrder; + } + + public static class PostOrder { + public List erpOrders; + List codes; + private String billType; + private String orderId; + + public String getStockIdFk() { + return stockIdFk; + } + + public void setStockIdFk(String stockIdFk) { + this.stockIdFk = stockIdFk; + } + + private String stockIdFk; + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getBillType() { + return billType; + } + + public void setBillType(String billType) { + this.billType = billType; + } + + public List getErpOrders() { + return erpOrders; + } + + public void setErpOrders(List erpOrders) { + this.erpOrders = erpOrders; + } + + public List getCodes() { + return codes; + } + + public void setCodes(List codes) { + this.codes = codes; + } + } + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/req/receipt/UnitMaintainFilterRequest.java b/api-udims/src/main/java/com/glxp/udi/admin/req/inout/UnitMaintainFilterRequest.java similarity index 70% rename from api-udims/src/main/java/com/glxp/udi/admin/req/receipt/UnitMaintainFilterRequest.java rename to api-udims/src/main/java/com/glxp/udi/admin/req/inout/UnitMaintainFilterRequest.java index 501da16..571a54b 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/req/receipt/UnitMaintainFilterRequest.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/req/inout/UnitMaintainFilterRequest.java @@ -1,4 +1,4 @@ -package com.glxp.udi.admin.req.receipt; +package com.glxp.udi.admin.req.inout; import com.glxp.udi.admin.req.ListPageRequest; import lombok.Data; @@ -7,5 +7,6 @@ import lombok.Data; public class UnitMaintainFilterRequest extends ListPageRequest { private String key; + private String customerId; } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/req/inout/WarehouseQueryRequest.java b/api-udims/src/main/java/com/glxp/udi/admin/req/inout/WarehouseQueryRequest.java index 54b541d..c35c937 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/req/inout/WarehouseQueryRequest.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/req/inout/WarehouseQueryRequest.java @@ -8,4 +8,5 @@ public class WarehouseQueryRequest extends ListPageRequest { private String corpOrderId; private String code; + private Long customerId; } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/req/receipt/FilterBatchnoCount.java b/api-udims/src/main/java/com/glxp/udi/admin/req/receipt/FilterBatchnoCount.java new file mode 100644 index 0000000..be122a6 --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/req/receipt/FilterBatchnoCount.java @@ -0,0 +1,10 @@ +package com.glxp.udi.admin.req.receipt; + +import lombok.Data; + +@Data +public class FilterBatchnoCount { + private String batchNo; + private String codeLevel; + private String packFlag; +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/req/receipt/FilterStockRequest.java b/api-udims/src/main/java/com/glxp/udi/admin/req/receipt/FilterStockRequest.java new file mode 100644 index 0000000..643b668 --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/req/receipt/FilterStockRequest.java @@ -0,0 +1,13 @@ +package com.glxp.udi.admin.req.receipt; + +import com.glxp.udi.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterStockRequest extends ListPageRequest { + private String code; + private String codeLevel; + private String pCode; + private String orderId; + private String batchNo; +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/res/auth/LoginResponse.java b/api-udims/src/main/java/com/glxp/udi/admin/res/auth/LoginResponse.java new file mode 100644 index 0000000..875b2ee --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/res/auth/LoginResponse.java @@ -0,0 +1,14 @@ +package com.glxp.udi.admin.res.auth; + +import lombok.Data; + +import java.util.List; + +@Data +public class LoginResponse { + + private String id; + private String token; + private List authRules; + private String creditNum; +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/res/auth/LoginUserInfoResponse.java b/api-udims/src/main/java/com/glxp/udi/admin/res/auth/LoginUserInfoResponse.java index 1fe0b53..5bf4384 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/res/auth/LoginUserInfoResponse.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/res/auth/LoginUserInfoResponse.java @@ -16,5 +16,5 @@ public class LoginUserInfoResponse { private Long CustomerId; // 权限列表 private List authRules; - private List roleIds; + private List roleIds; } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/res/inout/UdiRelevanceResponse.java b/api-udims/src/main/java/com/glxp/udi/admin/res/inout/UdiRelevanceResponse.java new file mode 100644 index 0000000..df8459f --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/res/inout/UdiRelevanceResponse.java @@ -0,0 +1,40 @@ +package com.glxp.udi.admin.res.inout; + +import lombok.Data; + +@Data +public class UdiRelevanceResponse { + + private int id; + private String thirdId; + private String thirdName; + private String uuid; + private String nameCode; + private String packLevel; + private String packRatio; + private Integer bhxjsl; + private Integer bhzxxsbzsl; + private Integer zxxsbzbhsydysl; + private String bhxjcpbm; + private String sjcpbm; // + private String bzcj; + private String addType; + private String deviceRecordKey; + private int isUseDy; + 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 ylqxzcrbarywmc; + private String sydycpbs; + private int versionNumber; + private int diType; + private String batchNo; + private String warehouseName; + private String customerId; + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/res/inout/UdiTraceResponse.java b/api-udims/src/main/java/com/glxp/udi/admin/res/inout/UdiTraceResponse.java new file mode 100644 index 0000000..1ca08a1 --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/res/inout/UdiTraceResponse.java @@ -0,0 +1,20 @@ +package com.glxp.udi.admin.res.inout; + +import lombok.Data; + +@Data +public class UdiTraceResponse { + + private String orderId; + private String actDate; + private String mainAction; + private String action; + private String fromCorp; + private Integer count; + private String cpmctymc; + private String ylqxzcrbarmc; + private String ggxh; + private String batchNo; + private String produceDate; + private String expireDate; +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/res/inout/WarehouseResponse.java b/api-udims/src/main/java/com/glxp/udi/admin/res/inout/WarehouseResponse.java index 6b877fc..fbd3b95 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/res/inout/WarehouseResponse.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/res/inout/WarehouseResponse.java @@ -15,4 +15,5 @@ public class WarehouseResponse { private String fromCorpId; private long id; private String fromCorp; + private Integer count; } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/auth/AuthLoginService.java b/api-udims/src/main/java/com/glxp/udi/admin/service/auth/AuthLoginService.java index 4865935..193182c 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/service/auth/AuthLoginService.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/service/auth/AuthLoginService.java @@ -5,5 +5,5 @@ import java.util.List; public interface AuthLoginService { List listRuleByAdminId(Long adminId); - + List listRuleIdByAdminId(Long adminId); } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/auth/impl/AuthLoginServiceImpl.java b/api-udims/src/main/java/com/glxp/udi/admin/service/auth/impl/AuthLoginServiceImpl.java index 97d65c2..b3fff3a 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/service/auth/impl/AuthLoginServiceImpl.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/service/auth/impl/AuthLoginServiceImpl.java @@ -78,4 +78,39 @@ public class AuthLoginServiceImpl implements AuthLoginService { return authRules; } + @Override + public List listRuleIdByAdminId(Long adminId) { + List authRules = new ArrayList<>(); + + // 如果存在，先从缓存中获取权限 +// String aarKey = String.format(CacheConstant.ADMIN_AUTH_RULES, adminId); +// if (CacheUtils.hasKey(aarKey)) { +// return new ArrayList<>(CacheUtils.sGetMembers(aarKey)); +// } +// log.info("开始获取数据库中的用户的权限规则列表"); + + // 获取角色ids + List authRoleAdmins = authRoleAdminService.listByAdminId(adminId); + + List roleIds = authRoleAdmins.stream().map(AuthRoleAdmin::getRole_id).collect(Collectors.toList()); + + // 角色授权列表 + List authPermissions = authPermissionService.listByRoleIdIn(roleIds); + List permissionRuleIds = authPermissions.stream().map(AuthPermission::getPermissionRuleId).collect(Collectors.toList()); + + // 获取授权的规则 + List authPermissionRules = authPermissionRuleService.listByIdIn(permissionRuleIds); + + // 获取权限列表 + authRules = authPermissionRules.stream().map(AuthPermissionRule::getId).collect(Collectors.toList()); + + // 如果为空，则添加一个空值 + if (authRules.isEmpty()) { + authRules.add(0L); + } + + + return authRules; + } + } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/info/IdentifierService.java b/api-udims/src/main/java/com/glxp/udi/admin/service/info/IdentifierService.java index 1cfbaef..e604ce8 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/service/info/IdentifierService.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/service/info/IdentifierService.java @@ -24,8 +24,15 @@ public interface IdentifierService { String randomCode(FilterIdentifierRequest filterIdentifierRequest); boolean isUsed(String facidentcode); + boolean isUsedIdentifyCode(String code); + boolean updateIsUsed(IdentifierEntity identifierEntity); + List selectIdentifyCode(String code); + + boolean isSptmUsed(String code); + + boolean isUdiUsed(String code); } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/info/SetupService.java b/api-udims/src/main/java/com/glxp/udi/admin/service/info/SetupService.java new file mode 100644 index 0000000..466bf71 --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/service/info/SetupService.java @@ -0,0 +1,16 @@ +package com.glxp.udi.admin.service.info; + + +import com.glxp.udi.admin.entity.info.SetupEntity; +import com.glxp.udi.admin.req.info.FilterSetupRequest; + +public interface SetupService { + + SetupEntity selectSetup(); + + SetupEntity findSetup(FilterSetupRequest filterSetupRequest); + + boolean modifySetup(SetupEntity setupEntity); + + boolean insertSetup(SetupEntity setupEntity); +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/info/impl/IdentifierServiceImpl.java b/api-udims/src/main/java/com/glxp/udi/admin/service/info/impl/IdentifierServiceImpl.java index ed3fab5..34b1609 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/service/info/impl/IdentifierServiceImpl.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/service/info/impl/IdentifierServiceImpl.java @@ -79,4 +79,36 @@ public class IdentifierServiceImpl implements IdentifierService { public boolean updateIsUsed(IdentifierEntity identifierEntity) { return identifierDao.updateIsUsed(identifierEntity); } + + @Override + public List selectIdentifyCode(String code) { + List identifierEntities = identifierDao.selectIdentifyCode(code); + return identifierEntities; + } + + @Override + public boolean isSptmUsed(String code) { + List identifierEntities = selectIdentifyCode(code); + if (identifierEntities != null && identifierEntities.size() > 0) { + for (IdentifierEntity identifierEntity : identifierEntities) { + if (identifierEntity.getIsSPTM().equals("1")) { + return true; + } + } + } + return false; + } + + @Override + public boolean isUdiUsed(String code) { + List identifierEntities = selectIdentifyCode(code); + if (identifierEntities != null && identifierEntities.size() > 0) { + for (IdentifierEntity identifierEntity : identifierEntities) { + if (identifierEntity.getIsUDI().equals("1")) { + return true; + } + } + } + return false; + } } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/info/impl/SetupServiceImpl.java b/api-udims/src/main/java/com/glxp/udi/admin/service/info/impl/SetupServiceImpl.java new file mode 100644 index 0000000..5018c2f --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/service/info/impl/SetupServiceImpl.java @@ -0,0 +1,39 @@ +package com.glxp.udi.admin.service.info.impl; + +import com.glxp.udi.admin.dao.info.SetupDao; +import com.glxp.udi.admin.entity.info.SetupEntity; +import com.glxp.udi.admin.req.info.FilterSetupRequest; +import com.glxp.udi.admin.service.info.SetupService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@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-udims/src/main/java/com/glxp/udi/admin/service/receipts/BussinessTypeService.java b/api-udims/src/main/java/com/glxp/udi/admin/service/inout/BussinessTypeService.java similarity index 91% rename from api-udims/src/main/java/com/glxp/udi/admin/service/receipts/BussinessTypeService.java rename to api-udims/src/main/java/com/glxp/udi/admin/service/inout/BussinessTypeService.java index 41f1e93..63dc64d 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/BussinessTypeService.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/service/inout/BussinessTypeService.java @@ -1,4 +1,5 @@ -package com.glxp.udi.admin.service.receipts; +package com.glxp.udi.admin.service.inout; + import com.glxp.udi.admin.entity.receipt.BussinessTypeEntity; import com.glxp.udi.admin.req.receipt.BussinessTypeFilterRequest; diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/inout/MyErpOrderService.java b/api-udims/src/main/java/com/glxp/udi/admin/service/inout/MyErpOrderService.java new file mode 100644 index 0000000..750bc0e --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/service/inout/MyErpOrderService.java @@ -0,0 +1,40 @@ +package com.glxp.udi.admin.service.inout; + + +import com.glxp.udi.admin.entity.inout.ErpOrderEntity; +import com.glxp.udi.admin.req.inout.FilterErpOrderRequest; + +import java.util.List; + +public interface MyErpOrderService { + + List filterAllMyErpOrder(FilterErpOrderRequest filterErpOrderRequest); + + List findByStockCheck(FilterErpOrderRequest filterErpOrderRequest); + + List filterMyErpOrder(FilterErpOrderRequest filterErpOrderRequest); + + List filterMyErpMainOrder(FilterErpOrderRequest filterErpOrderRequest); + + List filterMyErpDetailOrder(FilterErpOrderRequest filterErpOrderRequest); + + List findAllByDocids(List docids); + + List filterAllDocid(FilterErpOrderRequest filterErpOrderRequest); + + List filterAllDocidE(FilterErpOrderRequest filterErpOrderRequest); + + boolean insertErpOrders(List erpOrderEntities); + + boolean insertErpOrder(ErpOrderEntity erpOrderEntity); + + boolean updateErpOrder(ErpOrderEntity erpOrderEntity); + + List selectAllIds(List docids); + + boolean deleteById(String id); + + boolean deleteByPrimiyId(String id); + + boolean deleteByOrderId(String id); +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/inout/OrderService.java b/api-udims/src/main/java/com/glxp/udi/admin/service/inout/OrderService.java index ccf0aa0..49fae75 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/service/inout/OrderService.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/service/inout/OrderService.java @@ -1,5 +1,6 @@ package com.glxp.udi.admin.service.inout; + import com.glxp.udi.admin.entity.inout.OrderEntity; import com.glxp.udi.admin.entity.inout.WarehouseEntity; import com.glxp.udi.admin.req.inout.OrderFilterRequest; @@ -13,6 +14,8 @@ public interface OrderService { boolean insertOrder(OrderEntity orderEntity); + boolean updateOrder(OrderEntity orderEntity); + List listOrderError(OrderQueryRequest orderQueryRequest); List listOrderRepeat(OrderQueryRequest orderQueryRequest); @@ -27,10 +30,21 @@ public interface OrderService { boolean updateExportStatus(String orderId, String exportStatus); + boolean updateSignStatus(String orderId, String signStatus); + + boolean updateContrastStatus(String orderId, String contrastStatus); + boolean updateRemark(String orderId, String remark); + List findAllOrders(OrderFilterRequest orderFilterRequest); + List filterList(OrderFilterRequest orderFilterRequest); + OrderEntity findOne(OrderFilterRequest orderFilterRequest); + + OrderEntity findById(String orderId); + + List findCodesById(String orderId); List filterListByCode(List warehouseEntityList); } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/inout/UdiInfoService.java b/api-udims/src/main/java/com/glxp/udi/admin/service/inout/UdiInfoService.java new file mode 100644 index 0000000..c337100 --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/service/inout/UdiInfoService.java @@ -0,0 +1,37 @@ +package com.glxp.udi.admin.service.inout; + + +import com.glxp.udi.admin.entity.inout.UdiInfoEntity; +import com.glxp.udi.admin.req.inout.FilterUdiInfoRequest; + +import java.util.List; + +public interface UdiInfoService { + + List filterUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest); + + List filterUdiInfoGp(FilterUdiInfoRequest filterUdiInfoRequest); + + List filterAllUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest); + + UdiInfoEntity findByNameCode(String nameCode); + + UdiInfoEntity selectById(String nameCode); + + UdiInfoEntity findByUuid(String uuid); + + List findByUuids(String uuid); + + boolean insertUdiInfo(UdiInfoEntity udiInfoEntity); + + boolean insertUdiInfos(List udiInfoEntities); + + boolean updateUdiInfo(UdiInfoEntity udiInfoEntity); + + boolean deleteById(String id); + + boolean deleteByUuid(String uuid); + + boolean updateUdiInfoByUuid(UdiInfoEntity udiInfoEntity); + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/inout/UdiRelevanceService.java b/api-udims/src/main/java/com/glxp/udi/admin/service/inout/UdiRelevanceService.java new file mode 100644 index 0000000..ecb767b --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/service/inout/UdiRelevanceService.java @@ -0,0 +1,31 @@ +package com.glxp.udi.admin.service.inout; + + +import com.glxp.udi.admin.entity.inout.UdiRelevanceEntity; +import com.glxp.udi.admin.req.inout.FilterUdiInfoRequest; +import com.glxp.udi.admin.res.inout.UdiRelevanceResponse; + +import java.util.List; + +public interface UdiRelevanceService { + + List filterUdiRelevance(FilterUdiInfoRequest filterUdiInfoRequest); + + List filterUdiGp(FilterUdiInfoRequest filterUdiInfoRequest); + + List selectByUuid(String uuid); + + UdiRelevanceEntity selectById(String id); + UdiRelevanceEntity selectByThirdId(String thirdId); + + boolean insertUdiRelevance(UdiRelevanceEntity udiRelevanceEntity); + + boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity); + + boolean deleteById(String id); + + boolean deleteByIds(List id); + + boolean deleteByUuid(String uuid); + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/UnitMaintainService.java b/api-udims/src/main/java/com/glxp/udi/admin/service/inout/UnitMaintainService.java similarity index 58% rename from api-udims/src/main/java/com/glxp/udi/admin/service/receipts/UnitMaintainService.java rename to api-udims/src/main/java/com/glxp/udi/admin/service/inout/UnitMaintainService.java index d12bc39..21deeaa 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/UnitMaintainService.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/service/inout/UnitMaintainService.java @@ -1,7 +1,8 @@ -package com.glxp.udi.admin.service.receipts; +package com.glxp.udi.admin.service.inout; -import com.glxp.udi.admin.entity.receipt.UnitMaintainEntity; -import com.glxp.udi.admin.req.receipt.UnitMaintainFilterRequest; + +import com.glxp.udi.admin.entity.inout.UnitMaintainEntity; +import com.glxp.udi.admin.req.inout.UnitMaintainFilterRequest; import java.util.List; @@ -14,4 +15,6 @@ public interface UnitMaintainService { boolean deleteById(String id); UnitMaintainEntity selectById(String id); + + boolean updateUnit(UnitMaintainEntity unitMaintainEntity); } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/inout/WarehouseService.java b/api-udims/src/main/java/com/glxp/udi/admin/service/inout/WarehouseService.java index c050f83..ca5a65b 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/service/inout/WarehouseService.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/service/inout/WarehouseService.java @@ -1,8 +1,9 @@ package com.glxp.udi.admin.service.inout; import com.glxp.udi.admin.entity.inout.WarehouseEntity; -import com.glxp.udi.admin.entity.inout.WarehousetempEntity; +import com.glxp.udi.admin.entity.inout.Warehousetemp; import com.glxp.udi.admin.req.inout.CommitRequest; +import com.glxp.udi.admin.req.inout.FilterWarehouseRequest; import com.glxp.udi.admin.req.inout.WarehouseQueryRequest; import java.util.List; @@ -14,7 +15,7 @@ public interface WarehouseService { boolean insertWarehouses(List warehouseEntities); - boolean insertTempWarehouses(List warehouseEntities); + boolean insertTempWarehouses(List warehouseEntities); boolean deleteTempWarehouses(List warehouseEntities); @@ -24,16 +25,20 @@ public interface WarehouseService { List findByOrderId(WarehouseQueryRequest warehouseQueryRequest); + + List findAllByOrderId(WarehouseQueryRequest warehouseQueryRequest); + List findByReceiptId(String orderId); - List findTempByOrderId(CommitRequest commitRequest); + List findTempByOrderId(CommitRequest commitRequest); - List findErrorByOrderId(WarehouseQueryRequest warehouseQueryRequest); + List findErrorByOrderId(WarehouseQueryRequest warehouseQueryRequest); - List findByCode(String code); + List findByCode(FilterWarehouseRequest filterWarehouseRequest); boolean updateOrderId(String oldOrderId, String newOrderId); + List searchCode(String code,Long customerId); boolean updateUnit(String orderId, String fromCorpID, String fromCorp); } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/inout/impl/MyErpOrderServiceImpl.java b/api-udims/src/main/java/com/glxp/udi/admin/service/inout/impl/MyErpOrderServiceImpl.java new file mode 100644 index 0000000..ae94ae2 --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/service/inout/impl/MyErpOrderServiceImpl.java @@ -0,0 +1,123 @@ +package com.glxp.udi.admin.service.inout.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.udi.admin.dao.inout.MyErpOrderDao; +import com.glxp.udi.admin.entity.inout.ErpOrderEntity; +import com.glxp.udi.admin.req.inout.FilterErpOrderRequest; +import com.glxp.udi.admin.service.inout.MyErpOrderService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class MyErpOrderServiceImpl implements MyErpOrderService { + + @Resource + MyErpOrderDao myErpOrderDao; + + @Override + public List filterAllMyErpOrder(FilterErpOrderRequest filterErpOrderRequest) { + if (filterErpOrderRequest == null) { + return Collections.emptyList(); + } + + return myErpOrderDao.filterMyErpOrder(filterErpOrderRequest); + } + + @Override + public List findByStockCheck(FilterErpOrderRequest filterErpOrderRequest) { + + if (filterErpOrderRequest == null) { + return Collections.emptyList(); + } + int offset = (filterErpOrderRequest.getPage() - 1) * filterErpOrderRequest.getLimit(); + PageHelper.offsetPage(offset, filterErpOrderRequest.getLimit()); + return myErpOrderDao.findByStockCheck(filterErpOrderRequest.getOrderIds()); + } + + @Override + public List filterMyErpOrder(FilterErpOrderRequest filterErpOrderRequest) { + if (filterErpOrderRequest == null) { + return Collections.emptyList(); + } + int offset = (filterErpOrderRequest.getPage() - 1) * filterErpOrderRequest.getLimit(); + PageHelper.offsetPage(offset, filterErpOrderRequest.getLimit()); + return myErpOrderDao.filterMyErpOrder(filterErpOrderRequest); + } + + @Override + public List filterMyErpMainOrder(FilterErpOrderRequest filterErpOrderRequest) { + if (filterErpOrderRequest == null) { + return Collections.emptyList(); + } + int offset = (filterErpOrderRequest.getPage() - 1) * filterErpOrderRequest.getLimit(); + PageHelper.offsetPage(offset, filterErpOrderRequest.getLimit()); + return myErpOrderDao.filterMyErpMainOrder(filterErpOrderRequest); + } + + @Override + public List filterMyErpDetailOrder(FilterErpOrderRequest filterErpOrderRequest) { + if (filterErpOrderRequest == null) { + return Collections.emptyList(); + } + if (filterErpOrderRequest.getPage() != null && filterErpOrderRequest.getLimit() != null) { + int offset = (filterErpOrderRequest.getPage() - 1) * filterErpOrderRequest.getLimit(); + PageHelper.offsetPage(offset, filterErpOrderRequest.getLimit()); + } + + return myErpOrderDao.filterMyErpDetailOrder(filterErpOrderRequest); + } + + @Override + public List findAllByDocids(List docids) { + return myErpOrderDao.findAllByDocids(docids); + } + + @Override + public List filterAllDocid(FilterErpOrderRequest filterErpOrderRequest) { + return myErpOrderDao.filterAllDocid(filterErpOrderRequest); + } + + @Override + public List filterAllDocidE(FilterErpOrderRequest filterErpOrderRequest) { + return myErpOrderDao.filterAllDocidE(filterErpOrderRequest); + } + + @Override + public boolean insertErpOrders(List erpOrderEntities) { + return myErpOrderDao.insertErpOrders(erpOrderEntities); + } + + @Override + public boolean insertErpOrder(ErpOrderEntity erpOrderEntity) { + return myErpOrderDao.insertErpOrder(erpOrderEntity); + } + + @Override + public boolean updateErpOrder(ErpOrderEntity erpOrderEntity) { + return myErpOrderDao.updateErpOrder(erpOrderEntity); + } + + @Override + public List selectAllIds(List docids) { + return myErpOrderDao.selectAllIds(docids); + } + + @Override + public boolean deleteById(String id) { + return myErpOrderDao.deleteById(id); + } + + @Override + public boolean deleteByPrimiyId(String id) { + return myErpOrderDao.deleteByPrimiyId(id); + } + + @Override + public boolean deleteByOrderId(String id) { + return myErpOrderDao.deleteByOrderId(id); + } + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/inout/impl/OrderServiceImpl.java b/api-udims/src/main/java/com/glxp/udi/admin/service/inout/impl/OrderServiceImpl.java index 6bc268d..b9e0a87 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/service/inout/impl/OrderServiceImpl.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/service/inout/impl/OrderServiceImpl.java @@ -32,11 +32,17 @@ public class OrderServiceImpl implements OrderService { return orderDao.listOrder(orderQueryRequest); } + @Override public boolean insertOrder(OrderEntity orderEntity) { return orderDao.insertOrder(orderEntity); } + @Override + public boolean updateOrder(OrderEntity orderEntity) { + return orderDao.updateOrder(orderEntity); + } + @Override public List listOrderError(OrderQueryRequest orderQueryRequest) { if (orderQueryRequest == null) { @@ -82,11 +88,26 @@ public class OrderServiceImpl implements OrderService { return orderDao.updateExportStatus(orderId, exportStatus); } + @Override + public boolean updateSignStatus(String orderId, String signStatus) { + return orderDao.updateSignStatus(orderId, signStatus); + } + + @Override + public boolean updateContrastStatus(String orderId, String contrastStatus) { + return orderDao.updateContrastStatus(orderId, contrastStatus); + } + @Override public boolean updateRemark(String orderId, String remark) { return orderDao.updateRemark(orderId, remark); } + @Override + public List findAllOrders(OrderFilterRequest orderFilterRequest) { + return orderDao.filterList(orderFilterRequest); + } + @Override public List filterList(OrderFilterRequest orderFilterRequest) { if (orderFilterRequest == null) { @@ -97,6 +118,23 @@ public class OrderServiceImpl implements OrderService { return orderDao.filterList(orderFilterRequest); } + @Override + public OrderEntity findOne(OrderFilterRequest orderFilterRequest) { + return orderDao.findOne(orderFilterRequest); + } + + @Override + public OrderEntity findById(String orderId) { + OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); + orderFilterRequest.setId(orderId); + return orderDao.findOne(orderFilterRequest); + } + + @Override + public List findCodesById(String orderId) { + return warehouseDao.findCodesById(orderId); + } + @Override public List filterListByCode(List warehouseEntityList) { if (warehouseEntityList == null) { diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/inout/impl/UdiInfoServiceImpl.java b/api-udims/src/main/java/com/glxp/udi/admin/service/inout/impl/UdiInfoServiceImpl.java new file mode 100644 index 0000000..8f565aa --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/service/inout/impl/UdiInfoServiceImpl.java @@ -0,0 +1,102 @@ +package com.glxp.udi.admin.service.inout.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.udi.admin.dao.inout.UdiInfoDao; +import com.glxp.udi.admin.entity.inout.UdiInfoEntity; +import com.glxp.udi.admin.req.inout.FilterUdiInfoRequest; +import com.glxp.udi.admin.service.inout.UdiInfoService; +import com.glxp.udi.admin.util.FilterUdiUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class UdiInfoServiceImpl implements UdiInfoService { + + @Resource + UdiInfoDao udiInfoDao; + + @Override + public List filterUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest) { + if (filterUdiInfoRequest == null) { + return Collections.emptyList(); + } + int offset = (filterUdiInfoRequest.getPage() - 1) * filterUdiInfoRequest.getLimit(); + PageHelper.offsetPage(offset, filterUdiInfoRequest.getLimit()); + List data = udiInfoDao.filterUdiInfo(filterUdiInfoRequest); + return data; + } + + @Override + public List filterUdiInfoGp(FilterUdiInfoRequest filterUdiInfoRequest) { + if (filterUdiInfoRequest == null) { + return Collections.emptyList(); + } + int offset = (filterUdiInfoRequest.getPage() - 1) * filterUdiInfoRequest.getLimit(); + PageHelper.offsetPage(offset, filterUdiInfoRequest.getLimit()); + List data = udiInfoDao.filterUdiInfoGp(filterUdiInfoRequest); + return data; + } + + @Override + public List filterAllUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest) { + if (filterUdiInfoRequest == null) { + return Collections.emptyList(); + } + List data = udiInfoDao.filterUdiInfo(filterUdiInfoRequest); + return data; + } + + @Override + public UdiInfoEntity findByNameCode(String nameCode) { + String prefix = FilterUdiUtils.getDiStr(nameCode); + return udiInfoDao.findByNameCode(prefix); + } + + @Override + public UdiInfoEntity selectById(String nameCode) { + return udiInfoDao.selectById(nameCode); + } + + @Override + public UdiInfoEntity findByUuid(String uuid) { + return udiInfoDao.findByUuid(uuid); + } + + @Override + public List findByUuids(String uuid) { + return udiInfoDao.findByUuids(uuid); + } + + @Override + public boolean insertUdiInfo(UdiInfoEntity udiInfoEntity) { + return udiInfoDao.insertUdiInfo(udiInfoEntity); + } + + @Override + public boolean insertUdiInfos(List udiInfoEntities) { + return udiInfoDao.insertUdiInfos(udiInfoEntities); + } + + @Override + public boolean updateUdiInfo(UdiInfoEntity udiInfoEntity) { + return udiInfoDao.updateUdiInfo(udiInfoEntity); + } + + @Override + public boolean deleteById(String id) { + return udiInfoDao.deleteById(id); + } + + @Override + public boolean deleteByUuid(String uuid) { + return udiInfoDao.deleteByUuid(uuid); + } + + @Override + public boolean updateUdiInfoByUuid(UdiInfoEntity udiInfoEntity) { + return udiInfoDao.updateUdiInfoByUuid(udiInfoEntity); + } +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/inout/impl/UdiRelevanceServiceImpl.java b/api-udims/src/main/java/com/glxp/udi/admin/service/inout/impl/UdiRelevanceServiceImpl.java new file mode 100644 index 0000000..9801c6f --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/service/inout/impl/UdiRelevanceServiceImpl.java @@ -0,0 +1,84 @@ +package com.glxp.udi.admin.service.inout.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.udi.admin.dao.inout.UdiRelevanceDao; +import com.glxp.udi.admin.entity.inout.UdiRelevanceEntity; +import com.glxp.udi.admin.req.inout.FilterUdiInfoRequest; +import com.glxp.udi.admin.res.inout.UdiRelevanceResponse; +import com.glxp.udi.admin.service.inout.UdiRelevanceService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class UdiRelevanceServiceImpl implements UdiRelevanceService { + @Resource + UdiRelevanceDao udiRelevanceDao; + + @Override + public List filterUdiRelevance(FilterUdiInfoRequest filterUdiInfoRequest) { + if (filterUdiInfoRequest == null) { + return Collections.emptyList(); + } + int offset = (filterUdiInfoRequest.getPage() - 1) * filterUdiInfoRequest.getLimit(); + PageHelper.offsetPage(offset, filterUdiInfoRequest.getLimit()); + List data = udiRelevanceDao.filterUdiRelevance(filterUdiInfoRequest); + return data; + } + + @Override + public List filterUdiGp(FilterUdiInfoRequest filterUdiInfoRequest) { + if (filterUdiInfoRequest == null) { + return Collections.emptyList(); + } + if (filterUdiInfoRequest.getPage() != null) { + int offset = (filterUdiInfoRequest.getPage() - 1) * filterUdiInfoRequest.getLimit(); + PageHelper.offsetPage(offset, filterUdiInfoRequest.getLimit()); + } + + List data = udiRelevanceDao.filterUdiGp(filterUdiInfoRequest); + return data; + } + + @Override + public List selectByUuid(String uuid) { + return udiRelevanceDao.selectByUuid(uuid); + } + + @Override + public UdiRelevanceEntity selectById(String id) { + return udiRelevanceDao.selectById(id); + } + + @Override + public UdiRelevanceEntity selectByThirdId(String thirdId) { + return udiRelevanceDao.selectByThirdId(thirdId); + } + + @Override + public boolean insertUdiRelevance(UdiRelevanceEntity udiRelevanceEntity) { + return udiRelevanceDao.insertUdiRelevance(udiRelevanceEntity); + } + + @Override + public boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity) { + return udiRelevanceDao.updateUdiRelevance(udiRelevanceEntity); + } + + @Override + public boolean deleteById(String id) { + return udiRelevanceDao.deleteById(id); + } + + @Override + public boolean deleteByIds(List ids) { + return udiRelevanceDao.deleteByIds(ids); + } + + @Override + public boolean deleteByUuid(String uuid) { + return udiRelevanceDao.deleteByUuid(uuid); + } +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/impl/UnitMaintainServiceImpl.java b/api-udims/src/main/java/com/glxp/udi/admin/service/inout/impl/UnitMaintainServiceImpl.java similarity index 73% rename from api-udims/src/main/java/com/glxp/udi/admin/service/receipts/impl/UnitMaintainServiceImpl.java rename to api-udims/src/main/java/com/glxp/udi/admin/service/inout/impl/UnitMaintainServiceImpl.java index e26cd20..3eeefbb 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/impl/UnitMaintainServiceImpl.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/service/inout/impl/UnitMaintainServiceImpl.java @@ -1,10 +1,10 @@ -package com.glxp.udi.admin.service.receipts.impl; +package com.glxp.udi.admin.service.inout.impl; import com.github.pagehelper.PageHelper; -import com.glxp.udi.admin.dao.receipt.UnitMaintainDao; -import com.glxp.udi.admin.entity.receipt.UnitMaintainEntity; -import com.glxp.udi.admin.req.receipt.UnitMaintainFilterRequest; -import com.glxp.udi.admin.service.receipts.UnitMaintainService; +import com.glxp.udi.admin.dao.inout.UnitMaintainDao; +import com.glxp.udi.admin.entity.inout.UnitMaintainEntity; +import com.glxp.udi.admin.req.inout.UnitMaintainFilterRequest; +import com.glxp.udi.admin.service.inout.UnitMaintainService; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -42,4 +42,9 @@ public class UnitMaintainServiceImpl implements UnitMaintainService { public UnitMaintainEntity selectById(String id) { return unitMaintainDao.selectById(id); } + + @Override + public boolean updateUnit(UnitMaintainEntity unitMaintainEntity) { + return unitMaintainDao.updateUnit(unitMaintainEntity); + } } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/inout/impl/WareHouseServiceImpl.java b/api-udims/src/main/java/com/glxp/udi/admin/service/inout/impl/WareHouseServiceImpl.java index 48418a2..c1f3e9d 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/service/inout/impl/WareHouseServiceImpl.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/service/inout/impl/WareHouseServiceImpl.java @@ -2,10 +2,12 @@ package com.glxp.udi.admin.service.inout.impl; import com.github.pagehelper.PageHelper; import com.glxp.udi.admin.dao.inout.WarehouseDao; -import com.glxp.udi.admin.dao.inout.WarehousetempDao; +import com.glxp.udi.admin.dao.inout.WarehousetempMapper; import com.glxp.udi.admin.entity.inout.WarehouseEntity; -import com.glxp.udi.admin.entity.inout.WarehousetempEntity; +import com.glxp.udi.admin.entity.inout.Warehousetemp; +import com.glxp.udi.admin.entity.inout.WarehousetempExample; import com.glxp.udi.admin.req.inout.CommitRequest; +import com.glxp.udi.admin.req.inout.FilterWarehouseRequest; import com.glxp.udi.admin.req.inout.WarehouseQueryRequest; import com.glxp.udi.admin.service.inout.WarehouseService; import org.springframework.stereotype.Service; @@ -20,7 +22,7 @@ public class WareHouseServiceImpl implements WarehouseService { @Resource WarehouseDao warehouseDao; @Resource - WarehousetempDao warehousetempDao; + WarehousetempMapper warehousetempMapper; @Override public List listWarehouse(WarehouseQueryRequest warehouseQueryRequest) { @@ -44,9 +46,12 @@ public class WareHouseServiceImpl implements WarehouseService { } @Override - public boolean insertTempWarehouses(List warehouseEntities) { + public boolean insertTempWarehouses(List warehouseEntities) { if (warehouseEntities != null) { - warehousetempDao.insertTempWarehouses(warehouseEntities); + warehousetempMapper.insertTempWarehouses(warehouseEntities); +// for (int i = 0; i < warehouseEntities.size(); i++) { +// warehousetempMapper.insert(warehouseEntities.get(i)); +// } return true; } @@ -56,7 +61,7 @@ public class WareHouseServiceImpl implements WarehouseService { @Override public boolean deleteTempWarehouses(List warehouseEntities) { if (warehouseEntities != null) { - warehousetempDao.deleteTempWarehouses(warehouseEntities); + warehousetempMapper.deleteTempWarehouses(warehouseEntities); return true; } @@ -93,39 +98,49 @@ public class WareHouseServiceImpl implements WarehouseService { return warehouseDao.findByOrderId(warehouseQueryRequest); } + @Override + public List findAllByOrderId(WarehouseQueryRequest warehouseQueryRequest) { + if (warehouseQueryRequest == null) { + return Collections.emptyList(); + } + return warehouseDao.findByOrderId(warehouseQueryRequest); + } + @Override public List findByReceiptId(String orderId) { return warehouseDao.findByReceiptId(orderId); } @Override - public List findTempByOrderId(CommitRequest commitRequest) { + public List findTempByOrderId(CommitRequest commitRequest) { if (commitRequest == null) { return Collections.emptyList(); } - - return warehousetempDao.findTempByOrderId(commitRequest); + WarehousetempExample warehousetempExample = new WarehousetempExample(); + WarehousetempExample.Criteria criteria = warehousetempExample.createCriteria(); + criteria.andOrderidEqualTo(commitRequest.getOrderId()); + return warehousetempMapper.selectByExample(warehousetempExample); } @Override - public List findErrorByOrderId(WarehouseQueryRequest warehouseQueryRequest) { + public List findErrorByOrderId(WarehouseQueryRequest warehouseQueryRequest) { if (warehouseQueryRequest == null) { return Collections.emptyList(); } int offset = (warehouseQueryRequest.getPage() - 1) * warehouseQueryRequest.getLimit(); PageHelper.offsetPage(offset, warehouseQueryRequest.getLimit()); - return warehousetempDao.findErrorByOrderId(warehouseQueryRequest); + return warehousetempMapper.findErrorByOrderId(warehouseQueryRequest); } @Override - public List findByCode(String code) { + public List findByCode(FilterWarehouseRequest filterWarehouseRequest) { - return warehouseDao.findByCode(code); + return warehouseDao.findByCode(filterWarehouseRequest); } @Override @@ -135,6 +150,11 @@ public class WareHouseServiceImpl implements WarehouseService { return warehouseDao.updateOrderId(oldOrderId, newOrderId); } + @Override + public List searchCode(String code,Long customerId) { + return warehouseDao.searchCode(code,customerId); + } + @Override public boolean updateUnit(String orderId, String fromCorpID, String fromCorp) { diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/ManuorderService.java b/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/ManuorderService.java index 1e020b3..0a2fd18 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/ManuorderService.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/ManuorderService.java @@ -1,5 +1,6 @@ package com.glxp.udi.admin.service.receipts; + import com.glxp.udi.admin.entity.receipt.ManuOrderEntity; import com.glxp.udi.admin.req.receipt.ManuorderFilterRequest; @@ -13,5 +14,5 @@ public interface ManuorderService { boolean deleteById(String id); - boolean isExit( String OrderNo); + boolean isExit(String OrderNo); } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/MipsBarcodeService.java b/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/MipsBarcodeService.java index c50c1a0..a3111ee 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/MipsBarcodeService.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/MipsBarcodeService.java @@ -1,14 +1,33 @@ package com.glxp.udi.admin.service.receipts; + import com.glxp.udi.admin.entity.receipt.MipsBarcodeEntity; +import com.glxp.udi.admin.entity.receipt.StockDetailEntity; +import com.glxp.udi.admin.req.receipt.FilterBatchnoCount; +import com.glxp.udi.admin.req.receipt.FilterStockRequest; import com.glxp.udi.admin.req.receipt.MipsBarcodeRequest; import java.util.List; public interface MipsBarcodeService { + + List filterAll(MipsBarcodeRequest mipsBarcodeRequest) ; + List selectByOrderId(MipsBarcodeRequest mipsBarcodeRequest); + List selectAllByOrderId(String orderId); + List filterBarcodes(MipsBarcodeRequest mipsBarcodeRequest); + List filterStock(FilterStockRequest filterStockRequest); + + Integer selectCountByBatchno(FilterBatchnoCount fIlterBatchnoCount); + boolean insertList(List barcodeEntities); + + boolean deleteByCodes(List codes); + + boolean deleteByOrderId(String orderId); + + boolean updateDtFlag(List codes); } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/ProductInfoService.java b/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/ProductInfoService.java index e43f90a..ff657af 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/ProductInfoService.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/ProductInfoService.java @@ -1,5 +1,8 @@ package com.glxp.udi.admin.service.receipts; + +import com.glxp.udi.admin.entity.inout.ErpDetailCodeEntity; +import com.glxp.udi.admin.entity.inout.OrderDetailEntity; import com.glxp.udi.admin.entity.receipt.ProductInfoEntity; import com.glxp.udi.admin.req.receipt.ProductInfoFilterRequest; import com.glxp.udi.admin.res.inout.ProductInfoResponse; @@ -11,14 +14,29 @@ public interface ProductInfoService { List filterList(ProductInfoFilterRequest productInfoFilterRequest); List filterDrugList(ProductInfoFilterRequest productInfoFilterRequest); + + List filterDrugListByUuid(ProductInfoFilterRequest productInfoFilterRequest); + List filterUdiList(ProductInfoFilterRequest productInfoFilterRequest); boolean insertProductInfo(ProductInfoEntity productInfoEntity); boolean updateProductInfo(ProductInfoEntity productInfoEntity); - + boolean updateUseDy(ProductInfoEntity productInfoEntity); boolean deleteById(String id); + boolean deleteAll(List ids); + ProductInfoEntity selectById(String id); + List findByCodes(List codes); + + List findNameCodeByGid(String goodsId); + + boolean isExit(String nameCode); + + ErpDetailCodeEntity getDetailCode(String code); + + ErpDetailCodeEntity getDetailCodeNoBh(String code); + } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/ProductService.java b/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/ProductService.java index 8ab7bed..ba1f85f 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/ProductService.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/ProductService.java @@ -1,5 +1,7 @@ package com.glxp.udi.admin.service.receipts; + +import com.glxp.udi.admin.entity.receipt.ProductOrderDetailEntity; import com.glxp.udi.admin.entity.receipt.ProductOrderEntity; import com.glxp.udi.admin.req.receipt.AddProductRequest; import com.glxp.udi.admin.req.receipt.ProductFilterRequest; @@ -8,10 +10,15 @@ import java.util.List; public interface ProductService { - List filterList(ProductFilterRequest productFilterRequest); + List filterList(ProductFilterRequest productFilterRequest); + + List filterProductOrder(ProductFilterRequest productFilterRequest); boolean insertProduct(AddProductRequest productOrderEntity); + + boolean addProduct(ProductOrderEntity productOrderEntity); + boolean insertProductList(List productOrderEntities); boolean deleteById(String id); diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/ReceiptDetailService.java b/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/ReceiptDetailService.java index c409572..5e73b70 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/ReceiptDetailService.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/ReceiptDetailService.java @@ -1,5 +1,6 @@ package com.glxp.udi.admin.service.receipts; + import com.glxp.udi.admin.entity.receipt.ReceiptsdDetailEntity; import com.glxp.udi.admin.req.receipt.ReceiptDetailRequest; diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/ReceiptsService.java b/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/ReceiptsService.java index b995428..dc0fd2d 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/ReceiptsService.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/ReceiptsService.java @@ -1,5 +1,6 @@ package com.glxp.udi.admin.service.receipts; + import com.glxp.udi.admin.entity.receipt.ReceiptsEntity; import com.glxp.udi.admin.req.receipt.ReceiptFilterRequest; diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/impl/BussinessTypeServiceImpl.java b/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/impl/BussinessTypeServiceImpl.java deleted file mode 100644 index fb1cd58..0000000 --- a/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/impl/BussinessTypeServiceImpl.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.glxp.udi.admin.service.receipts.impl; - -import com.github.pagehelper.PageHelper; -import com.glxp.udi.admin.dao.receipt.BussinessTypeDao; -import com.glxp.udi.admin.entity.receipt.BussinessTypeEntity; -import com.glxp.udi.admin.req.receipt.BussinessTypeFilterRequest; -import com.glxp.udi.admin.service.receipts.BussinessTypeService; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.Collections; -import java.util.List; -@Service -public class BussinessTypeServiceImpl implements BussinessTypeService { - - @Resource - BussinessTypeDao bussinessTypeDao; - - @Override - public List filterList(BussinessTypeFilterRequest bussinessTypeFilterRequest) { - if (bussinessTypeFilterRequest == null) { - return Collections.emptyList(); - } - int offset = (bussinessTypeFilterRequest.getPage() - 1) * bussinessTypeFilterRequest.getLimit(); - PageHelper.offsetPage(offset, bussinessTypeFilterRequest.getLimit()); - List data = bussinessTypeDao.filterList(bussinessTypeFilterRequest); - return data; - } - - @Override - public boolean insertBussinessType(BussinessTypeEntity bussinessTypeEntity) { - return bussinessTypeDao.insertBussinessType(bussinessTypeEntity); - } - - @Override - public boolean updateBussinessType(BussinessTypeEntity bussinessTypeEntity) { - return bussinessTypeDao.updateBussinessType(bussinessTypeEntity); - } - - @Override - public boolean deleteById(String id) { - return bussinessTypeDao.deleteById(id); - } -} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/impl/MipsBarcodeServiceImpl.java b/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/impl/MipsBarcodeServiceImpl.java index 832bc1d..92f7e52 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/impl/MipsBarcodeServiceImpl.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/impl/MipsBarcodeServiceImpl.java @@ -3,6 +3,9 @@ package com.glxp.udi.admin.service.receipts.impl; import com.github.pagehelper.PageHelper; import com.glxp.udi.admin.dao.receipt.MipsBarcodeDao; import com.glxp.udi.admin.entity.receipt.MipsBarcodeEntity; +import com.glxp.udi.admin.entity.receipt.StockDetailEntity; +import com.glxp.udi.admin.req.receipt.FilterBatchnoCount; +import com.glxp.udi.admin.req.receipt.FilterStockRequest; import com.glxp.udi.admin.req.receipt.MipsBarcodeRequest; import com.glxp.udi.admin.service.receipts.MipsBarcodeService; import org.springframework.stereotype.Service; @@ -10,11 +13,18 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Collections; import java.util.List; + @Service public class MipsBarcodeServiceImpl implements MipsBarcodeService { @Resource MipsBarcodeDao mipsBarcodeDao; + @Override + public List filterAll(MipsBarcodeRequest mipsBarcodeRequest) { + List data = mipsBarcodeDao.filterBarcodes(mipsBarcodeRequest); + return data; + } + @Override public List selectByOrderId(MipsBarcodeRequest mipsBarcodeRequest) { if (mipsBarcodeRequest == null) { @@ -26,6 +36,12 @@ public class MipsBarcodeServiceImpl implements MipsBarcodeService { return data; } + @Override + public List selectAllByOrderId(String orderId) { + List data = mipsBarcodeDao.selectByOrderId(orderId); + return data; + } + @Override public List filterBarcodes(MipsBarcodeRequest mipsBarcodeRequest) { if (mipsBarcodeRequest == null) { @@ -37,8 +53,39 @@ public class MipsBarcodeServiceImpl implements MipsBarcodeService { return data; } + @Override + public List filterStock(FilterStockRequest filterStockRequest) { + if (filterStockRequest == null) { + return Collections.emptyList(); + } + int offset = (filterStockRequest.getPage() - 1) * filterStockRequest.getLimit(); + PageHelper.offsetPage(offset, filterStockRequest.getLimit()); + List data = mipsBarcodeDao.filterStock(filterStockRequest); + return data; + } + + @Override + public Integer selectCountByBatchno(FilterBatchnoCount filterBatchnoCount) { + return mipsBarcodeDao.selectCountByBatchno(filterBatchnoCount); + } + @Override public boolean insertList(List barcodeEntities) { return mipsBarcodeDao.insertList(barcodeEntities); } + + @Override + public boolean deleteByCodes(List codes) { + return mipsBarcodeDao.deleteByCodes(codes); + } + + @Override + public boolean deleteByOrderId(String orderId) { + return mipsBarcodeDao.deleteByOrderId(orderId); + } + + @Override + public boolean updateDtFlag(List codes) { + return mipsBarcodeDao.updateDtFlag(codes); + } } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/impl/ProductInfoServiceImpl.java b/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/impl/ProductInfoServiceImpl.java index d86cda7..022eb18 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/impl/ProductInfoServiceImpl.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/impl/ProductInfoServiceImpl.java @@ -2,6 +2,8 @@ package com.glxp.udi.admin.service.receipts.impl; import com.github.pagehelper.PageHelper; import com.glxp.udi.admin.dao.receipt.ProductInfoDao; +import com.glxp.udi.admin.entity.inout.ErpDetailCodeEntity; +import com.glxp.udi.admin.entity.inout.OrderDetailEntity; import com.glxp.udi.admin.entity.receipt.ProductInfoEntity; import com.glxp.udi.admin.req.receipt.ProductInfoFilterRequest; import com.glxp.udi.admin.res.inout.ProductInfoResponse; @@ -24,8 +26,11 @@ public class ProductInfoServiceImpl implements ProductInfoService { if (productInfoFilterRequest == null) { return Collections.emptyList(); } - int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit(); - PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit()); + if(productInfoFilterRequest.getPage()!=null){ + int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit(); + PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit()); + } + List data = productInfoDao.filterList(productInfoFilterRequest); return data; @@ -42,6 +47,18 @@ public class ProductInfoServiceImpl implements ProductInfoService { return data; } + @Override + public List filterDrugListByUuid(ProductInfoFilterRequest productInfoFilterRequest) { + if (productInfoFilterRequest == null) { + return Collections.emptyList(); + } + int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit(); + PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit()); + List data = productInfoDao.filterDrugListByUuid(productInfoFilterRequest); + return data; + } + + @Override public List filterUdiList(ProductInfoFilterRequest productInfoFilterRequest) { if (productInfoFilterRequest == null) { @@ -64,13 +81,52 @@ public class ProductInfoServiceImpl implements ProductInfoService { return productInfoDao.updateProductInfo(productInfoEntity); } + @Override + public boolean updateUseDy(ProductInfoEntity productInfoEntity) { + return productInfoDao.updateUseDy(productInfoEntity); + } + @Override public boolean deleteById(String id) { return productInfoDao.deleteById(id); } + @Override + public boolean deleteAll(List ids) { + return productInfoDao.deleteAll(ids); + } + @Override public ProductInfoEntity selectById(String id) { return productInfoDao.selectById(id); } + + + @Override + public List findByCodes(List codes) { + return productInfoDao.findByCodes(codes); + } + + @Override + public List findNameCodeByGid(String goodsId) { + return productInfoDao.findNameCodeByGid(goodsId); + } + + @Override + public boolean isExit(String nameCode) { + String name = productInfoDao.isExit(nameCode); + if (name == null) { + return false; + } else return true; + } + + @Override + public ErpDetailCodeEntity getDetailCode(String code) { + return productInfoDao.getDetailCode(code); + } + + @Override + public ErpDetailCodeEntity getDetailCodeNoBh(String code) { + return productInfoDao.getDetailCodeNoBh(code); + } } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/impl/ProductServiceImpl.java b/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/impl/ProductServiceImpl.java index bb95430..a6573fd 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/impl/ProductServiceImpl.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/service/receipts/impl/ProductServiceImpl.java @@ -2,6 +2,7 @@ package com.glxp.udi.admin.service.receipts.impl; import com.github.pagehelper.PageHelper; import com.glxp.udi.admin.dao.receipt.ProductDao; +import com.glxp.udi.admin.entity.receipt.ProductOrderDetailEntity; import com.glxp.udi.admin.entity.receipt.ProductOrderEntity; import com.glxp.udi.admin.req.receipt.AddProductRequest; import com.glxp.udi.admin.req.receipt.ProductFilterRequest; @@ -19,21 +20,31 @@ public class ProductServiceImpl implements ProductService { ProductDao productDao; @Override - public List filterList(ProductFilterRequest productFilterRequest) { + public List filterList(ProductFilterRequest productFilterRequest) { if (productFilterRequest == null) { return Collections.emptyList(); } int offset = (productFilterRequest.getPage() - 1) * productFilterRequest.getLimit(); PageHelper.offsetPage(offset, productFilterRequest.getLimit()); - List data = productDao.filterList(productFilterRequest); + List data = productDao.filterList(productFilterRequest); return data; } + @Override + public List filterProductOrder(ProductFilterRequest productFilterRequest) { + return productDao.filterProductOrder(productFilterRequest); + } + @Override public boolean insertProduct(AddProductRequest productOrderEntity) { return productDao.insertProduct(productOrderEntity); } + @Override + public boolean addProduct(ProductOrderEntity productOrderEntity) { + return productDao.addProduct(productOrderEntity); + } + @Override public boolean insertProductList(List productOrderEntities) { return productDao.insertProductList(productOrderEntities); diff --git a/api-udims/src/main/java/com/glxp/udi/admin/thread/TaskExecutorConfig.java b/api-udims/src/main/java/com/glxp/udi/admin/thread/TaskExecutorConfig.java index 8f1d6d7..8e0046c 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/thread/TaskExecutorConfig.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/thread/TaskExecutorConfig.java @@ -22,9 +22,9 @@ public class TaskExecutorConfig implements AsyncConfigurer { @Override public Executor getAsyncExecutor() { ThreadPoolTaskExecutor threadPool = new ThreadPoolTaskExecutor(); - threadPool.setCorePoolSize(2);//当前线程数 + threadPool.setCorePoolSize(5);//当前线程数 threadPool.setMaxPoolSize(120);// 最大线程数 - threadPool.setQueueCapacity(1);//线程池所使用的缓冲队列 + threadPool.setQueueCapacity(5);//线程池所使用的缓冲队列 threadPool.setWaitForTasksToCompleteOnShutdown(true);//等待任务在关机时完成--表明等待所有线程执行完 threadPool.setAwaitTerminationSeconds(60 * 15);// 等待时间 （默认为0，此时立即停止），并没等待xx秒后强制停止 threadPool.setThreadNamePrefix("MyAsync-");// 线程名称前缀 diff --git a/api-udims/src/main/java/com/glxp/udi/admin/thread/TransInoutService.java b/api-udims/src/main/java/com/glxp/udi/admin/thread/TransInoutService.java new file mode 100644 index 0000000..4f0f13c --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/thread/TransInoutService.java @@ -0,0 +1,241 @@ +package com.glxp.udi.admin.thread; + +import com.glxp.udi.admin.controller.inout.InoutUtils; +import com.glxp.udi.admin.entity.inout.ErpOrderEntity; +import com.glxp.udi.admin.entity.inout.OrderEntity; +import com.glxp.udi.admin.entity.inout.WarehouseEntity; +import com.glxp.udi.admin.entity.inout.Warehousetemp; +import com.glxp.udi.admin.req.inout.CommitRequest; +import com.glxp.udi.admin.req.inout.FilterErpOrderRequest; +import com.glxp.udi.admin.req.inout.OrderFilterRequest; +import com.glxp.udi.admin.req.inout.PostOrderRequest; +import com.glxp.udi.admin.service.info.SetupService; +import com.glxp.udi.admin.service.inout.*; +import com.glxp.udi.admin.service.receipts.MipsBarcodeService; +import com.glxp.udi.admin.service.receipts.ProductInfoService; +import com.glxp.udi.admin.service.receipts.ProductService; +import com.glxp.udi.admin.util.WarehousBeanUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Service +public class TransInoutService { + + private static final Logger logger = LoggerFactory.getLogger(TransInoutService.class); + @Resource + private WarehouseService warehouseService; + @Resource + private OrderService orderService; + @Resource + private MipsBarcodeService mipsBarcodeService; + @Resource + private ProductInfoService productInfoService; + @Resource + private MyErpOrderService myErpOrderService; + @Resource + UdiRelevanceService udiRelevanceService; + @Resource + ProductService productService; + @Resource + SetupService setupService; + @Resource + private UdiInfoService udiInfoService; + @Value("${UCLOD_SERVER_URL}") + private String ucloudUrl; + @Value("${UDI_SERVER_URL}") + private String udiUrl; + + @Async + public void transInout(PostOrderRequest postOrderRequest, long customerId) { + + List postOrders = postOrderRequest.getPostOrder(); + if (postOrders != null && postOrders.size() > 0) { + for (int i = 0; i < postOrders.size(); i++) { + PostOrderRequest.PostOrder postOrder = postOrders.get(i); + List warehouseEntityList = postOrder.getCodes(); + List warehousetempList = new WarehousBeanUtils().entityToTemp(warehouseEntityList, customerId); + if (warehousetempList != null && warehousetempList.size() > 0) { + Warehousetemp warehouseEntity = warehousetempList.get(0); + String orderId = System.currentTimeMillis() + i + ""; + OrderEntity orderSaveRequest = new OrderEntity(); + orderSaveRequest.setId(orderId); + if (warehouseEntity.getActdate() != null) { + orderSaveRequest.setActDate(warehouseEntity.getActdate()); + } + orderSaveRequest.setCustomerId(customerId); + orderSaveRequest.setAction(warehouseEntity.getAction()); + orderSaveRequest.setActor(warehouseEntity.getActor()); + orderSaveRequest.setCorpOrderId(warehouseEntity.getCorporderid()); + orderSaveRequest.setFromCorpId(warehouseEntity.getFromcorpid()); + orderSaveRequest.setMainAction(warehouseEntity.getMainaction()); + orderSaveRequest.setFromCorp(warehouseEntity.getFromcorp()); + orderSaveRequest.setFromType("手持终端"); + orderSaveRequest.setStatus("process"); + orderSaveRequest.setExportStatus("未上传"); + orderSaveRequest.setStockCheckFk(postOrder.getStockIdFk()); + orderSaveRequest.setSignStatus("0"); + List docidsList = postOrder.getErpOrders(); + String docidStr = ""; + if (docidsList != null) { + for (String key : docidsList) { + docidStr = docidStr + "," + key; + } + if (docidStr.length() > 1) { + docidStr = docidStr.substring(1); + orderSaveRequest.setErpFk(docidStr); + } + } + + orderService.insertOrder(orderSaveRequest); + for (int index = 0; index < warehousetempList.size(); index++) { + warehousetempList.get(index).setOrderid(orderId); + } + warehouseService.insertTempWarehouses(warehousetempList); + List filterList = warehousetempList; + List insertList = new ArrayList<>(); + String result; + orderService.updateRemark(filterList.get(0).getOrderid(), "正在处理"); + for (int j = 0; j < filterList.size(); j++) { + Warehousetemp warehousetemp = filterList.get(j); + result = new InoutUtils().filterCode(warehouseService, warehousetemp, setupService); + if (result == null) { + insertList.add(warehousetemp); + } else { + orderService.updateOrderStatus(warehousetemp.getOrderid(), "error"); + orderService.updateRemark(warehousetemp.getOrderid(), result); + insertList.clear(); + break; + } + } + postOrders.get(i).setOrderId(orderId); + + if (insertList.size() > 0) { + orderId = insertList.get(0).getOrderid(); + warehouseService.insertWarehouses(new WarehousBeanUtils().tempsToEntitys(insertList)); + Warehousetemp warehousetemp = insertList.get(0); + CommitRequest commitRequest = new CommitRequest(); + commitRequest.setOrderId(warehousetemp.getOrderid()); + List warehousetemps = warehouseService.findTempByOrderId(commitRequest); + orderService.updateOrderStatus(orderId, "success"); + List ids = new ArrayList<>(); + for (Warehousetemp w : warehousetemps) { + ids.add(w.getId()); + } + warehouseService.deleteTempWarehouses(ids); + insertList.clear(); + } + } + } + + //生成对照表 + for (int i = 0; i < postOrders.size(); i++) { + PostOrderRequest.PostOrder postOrder = postOrders.get(i); + List transData = warehouseService.findByReceiptId(postOrder.getOrderId()); + new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, transData); + + } + } + } + + + @Async + public void repeatCommit(CommitRequest commitRequest) { + List warehousetempList = warehouseService.findTempByOrderId(commitRequest); + if (warehousetempList != null && warehousetempList.size() > 0) { + String result; + + List insertList = new ArrayList<>(); + for (int j = 0; j < warehousetempList.size(); j++) { + Warehousetemp warehousetemp = warehousetempList.get(j); + result = new InoutUtils().filterCode(warehouseService, warehousetemp, setupService); + if (result == null) { + insertList.add(warehousetemp); + } else { + orderService.updateRemark(warehousetemp.getOrderid(), result); + insertList.clear(); + return; + } + } + if (insertList.size() > 0) { + warehouseService.insertWarehouses(new WarehousBeanUtils().tempsToEntitys(insertList)); + orderService.updateOrderStatus(insertList.get(0).getOrderid(), "success"); + List ids = new ArrayList<>(); + for (Warehousetemp warehousetemp : insertList) { + ids.add(warehousetemp.getId()); + } + warehouseService.deleteTempWarehouses(ids); + String orderId = insertList.get(0).getOrderid(); + String type = insertList.get(0).getAction(); + + OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); + orderFilterRequest.setId(orderId); + OrderEntity orderEntity = orderService.findOne(orderFilterRequest); + String docidStr = orderEntity.getErpFk(); + String[] docidArray; + List docids = new ArrayList<>(); + if (docidStr != null && docidStr.length() > 0) { + docidArray = docidStr.split(","); + for (int i = 0; i < docidArray.length; i++) { + docids.add(docidArray[i]); + } + } + if (docids == null || docids.size() == 0) { + FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest(); + filterErpOrderRequest.setOrderId(orderId); + docids = myErpOrderService.filterAllDocid(filterErpOrderRequest); + docids = getDocids(docids); + } + List datas = warehouseService.findByReceiptId(orderId); + new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, datas); + } + } else { + return; + } + } + + + public void updateErpOrderId(List erpOrderEntities, String oldId, String newId) { + if (erpOrderEntities != null) { + List inserts = new ArrayList<>(); + for (ErpOrderEntity erpOrderEntity : erpOrderEntities) { + if (erpOrderEntity.getOrderIdFk() == null || erpOrderEntity.getOrderIdFk().equals(oldId)) { + erpOrderEntity.setOrderIdFk(newId); + inserts.add(erpOrderEntity); + } + } + myErpOrderService.insertErpOrders(inserts); + } + + } + + public List getDocids(List ids) { + Map filter = new HashMap<>(); + List docids = new ArrayList<>(); + for (String id : ids) { + if (id.contains(",")) { + String[] dociArray = id.split(","); + if (dociArray != null && dociArray.length > 0) { + for (int i = 0; i < dociArray.length; i++) { + filter.put(dociArray[i], dociArray[i]); + } + } + } else { + filter.put(id, id); + } + } + for (String docid : filter.keySet()) { + docids.add(docid); + } + return docids; + + } +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/util/DateUtil.java b/api-udims/src/main/java/com/glxp/udi/admin/util/DateUtil.java index feb65e6..673c99d 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/util/DateUtil.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/util/DateUtil.java @@ -64,6 +64,15 @@ public class DateUtil extends org.apache.commons.lang3.time.DateUtils { return dateString; } + public static long timeToStamp(String mydate) throws Exception { + final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + final Date datetime = sdf.parse(mydate);//将你的日期转换为时间戳 + final long time = datetime.getTime(); + System.out.println(mydate + "转换后是：" + time); + return time; + + } + /** * 得到当前日期字符串 格式（yyyy-MM-dd） */ diff --git a/api-udims/src/main/java/com/glxp/udi/admin/util/FilterUdiUtils.java b/api-udims/src/main/java/com/glxp/udi/admin/util/FilterUdiUtils.java index c2acb37..afea498 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/util/FilterUdiUtils.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/util/FilterUdiUtils.java @@ -1,6 +1,7 @@ package com.glxp.udi.admin.util; +import com.glxp.udi.admin.entity.inout.UdiInfoEntity; import com.glxp.udi.admin.entity.udid.UdiEntity; /** @@ -11,6 +12,19 @@ public class FilterUdiUtils { private static final String TAG = "FilterUdiUtils"; public static UdiEntity getUdi(String data) { + if (data != null && data.length() > 2) { + if (data.substring(0, 2).equals("MA")) { + return getZGCUdi(data); + } else if (data.substring(0, 2).equals("01")) { + return getGS1Udi(data); + } else if (data.substring(0, 1).equals("#")) { + return getGLXPUdi(data); + } + } + return null; + } + + public static UdiEntity getGS1Udi(String data) { String batchNo = ""; String produceDate = ""; String expireDate = ""; @@ -20,7 +34,6 @@ public class FilterUdiUtils { if (data.length() >= 16) { udi = data.substring(2, 16); if (data.length() >= 18 && data.substring(16, 18).equals("10")) { - if (data.contains("\u001D")) { String[] splits = data.split("\u001D"); String front = splits[0]; @@ -50,6 +63,8 @@ public class FilterUdiUtils { } else if ((last != null && last.length() >= 2) && last.substring(0, 2).equals("21")) { serialNo = last.substring(2, last.length()); } + } else { + batchNo = data.substring(18); } @@ -61,13 +76,13 @@ public class FilterUdiUtils { if (data.contains("\u001D")) { String[] splits = data.split("\u001D"); batchNo = splits[0].substring(34, splits[0].length()); - serialNo = splits[1].substring(36, splits[1].length()); + serialNo = splits[1].substring(2); } else { batchNo = data.substring(34, data.length()); } } - } else if (data.substring(24, 26).equals("10")) { + } else if (data.length() >= 26 && data.substring(24, 26).equals("10")) { if (data.contains("\u001D")) { String[] splits = data.split("\u001D"); batchNo = splits[0].substring(26, splits[0].length()); @@ -84,6 +99,9 @@ public class FilterUdiUtils { batchNo = data.substring(26, data.length()); } + } else if (data.length() >= 26 && data.substring(24, 26).equals("21")) { + + serialNo = data.substring(26); } } else if (data.length() >= 18 && data.substring(16, 18).equals("17")) { expireDate = data.substring(18, 24); @@ -93,7 +111,7 @@ public class FilterUdiUtils { if (data.contains("\u001D")) { String[] splits = data.split("\u001D"); batchNo = splits[0].substring(34, splits[0].length()); - serialNo = splits[1].substring(2, splits[1].length()); + serialNo = splits[1].substring(2); } else { batchNo = data.substring(34, data.length()); } @@ -102,15 +120,26 @@ public class FilterUdiUtils { } else if (data.length() >= 26 && data.substring(24, 26).equals("10")) { if (data.contains("\u001D")) { String[] splits = data.split("\u001D"); - batchNo = splits[0].substring(26, splits[0].length()); + batchNo = splits[0].substring(26); String last = splits[1]; if (last.substring(0, 2).equals("11")) { produceDate = last.substring(2, 8); + if (last.length() > 8 && last.substring(8, 10).equals("21")) { + serialNo = last.substring(10); + } + } else if (last.substring(0, 2).equals("21")) { + serialNo = last.substring(2); } } else { batchNo = data.substring(26, data.length()); } + } else if (data.length() >= 26 && data.substring(24, 26).equals("21")) { + + serialNo = data.substring(26); } + + } else if (data.length() >= 18 && data.substring(16, 18).equals("21")) { + serialNo = data.substring(18); } udiEntity = new UdiEntity(); udiEntity.setUdi(udi); @@ -122,4 +151,105 @@ public class FilterUdiUtils { return udiEntity; } + public static UdiEntity getZGCUdi(String data) { + String batchNo = ""; + String produceDate = ""; + String expireDate = ""; + String serialNo = null; + String udi = data; + String[] spilts = data.split("[.]"); + if (spilts != null && spilts.length >= 5) { + for (int i = 0; i < 5; i++) { + udi = udi + "." + spilts[i]; + } + udi = udi.substring(1); + for (int i = 0; i < spilts.length; i++) { + String tempStr = spilts[i]; + if (tempStr != null && tempStr.length() > 1 && tempStr.substring(0, 1).equals("P")) { + produceDate = tempStr.substring(1); + } else if (tempStr != null && tempStr.length() > 1 && tempStr.substring(0, 1).equals("L")) { + batchNo = tempStr.substring(1); + } else if (tempStr != null && tempStr.length() > 1 && tempStr.substring(0, 1).equals("E")) { + expireDate = tempStr.substring(1); + } else if (tempStr != null && tempStr.length() > 1 && tempStr.substring(0, 1).equals("S")) { + serialNo = tempStr.substring(1); + } + } + } + + UdiEntity udiEntity = new UdiEntity(); + udiEntity.setBatchNo(batchNo); + udiEntity.setExpireDate(expireDate); + udiEntity.setProduceDate(produceDate); + udiEntity.setUdi(udi); + udiEntity.setSerialNo(serialNo); + return udiEntity; + + } + + public static UdiEntity getGLXPUdi(String data) { + String batchNo = ""; + String produceDate = ""; + String expireDate = ""; + String serialNo = null; + String udi = ""; + String[] spilts = data.split("#"); + if (spilts != null && spilts.length >= 5) { + udi = spilts[1]; + produceDate = spilts[2]; + expireDate = spilts[3]; + batchNo = spilts[4]; + if (spilts.length > 6) { + serialNo = spilts[5]; + if (serialNo != null && serialNo.equals("")) { + serialNo = null; + } + } + + } + UdiEntity udiEntity = new UdiEntity(); + udiEntity.setBatchNo(batchNo); + udiEntity.setExpireDate(expireDate); + udiEntity.setProduceDate(produceDate); + udiEntity.setUdi(udi); + udiEntity.setSerialNo(serialNo); + return udiEntity; + } + + public static String getDiStr(String data) { + String prefix = ""; + if (data != null && data.length() > 2) { + if (data.substring(0, 2).equals("MA")) { + String[] spilts = data.split("[.]"); + if (spilts != null && spilts.length >= 5) { + for (int i = 0; i < 5; i++) { + prefix = prefix + "." + spilts[i]; + } + prefix = prefix.substring(1); + } + } else if (data.substring(0, 2).equals("01") && data.length() >= 16) { + prefix = data.substring(2, 16); + } else if (data.substring(0, 1).equals("#")) { + String[] spilts = data.split("#"); + if (spilts != null && spilts.length >= 1) + prefix = spilts[1]; + } + } + if (prefix.equals("")) + return data; + return prefix; + } + + + public static UdiInfoEntity transUdi(UdiInfoEntity data) { + UdiEntity udiEntity = getUdi(data.getCode()); + if (udiEntity != null) { + data.setBatchNo(udiEntity.getBatchNo()); + data.setProduceDate(udiEntity.getProduceDate()); + data.setExpireDate(udiEntity.getExpireDate()); + data.setSerialNo(udiEntity.getSerialNo()); + } + return data; + } + } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/util/GetAuthAdminUtil.java b/api-udims/src/main/java/com/glxp/udi/admin/util/GetAuthAdminUtil.java new file mode 100644 index 0000000..232bebd --- /dev/null +++ b/api-udims/src/main/java/com/glxp/udi/admin/util/GetAuthAdminUtil.java @@ -0,0 +1,24 @@ +package com.glxp.udi.admin.util; + +import com.glxp.udi.admin.entity.auth.AuthAdmin; +import com.glxp.udi.admin.service.auth.AuthAdminService; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; + +public class GetAuthAdminUtil { + AuthAdminService authAdminService; + + public GetAuthAdminUtil(AuthAdminService authAdminService) { + this.authAdminService = authAdminService; + } + + + public AuthAdmin getAuthAdmin(ServletRequestAttributes attributes) { + HttpServletRequest request = attributes.getRequest(); + String userId = request.getHeader("ADMIN_ID"); + AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); + return authAdmin; + } + +} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/util/HttpClient.java b/api-udims/src/main/java/com/glxp/udi/admin/util/HttpClient.java index 9a6294c..1ee8788 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/util/HttpClient.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/util/HttpClient.java @@ -1,6 +1,8 @@ package com.glxp.udi.admin.util; import com.alibaba.fastjson.JSONObject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.util.LinkedMultiValueMap; @@ -11,9 +13,10 @@ import java.util.Iterator; import java.util.Map; public class HttpClient { + private static final Logger logger = LoggerFactory.getLogger(HttpClient.class); - public static String post(String url,Object object) { - System.out.println("参数:\n"+object); + public static String post(String url, Object object) { + System.out.println("参数:\n" + object); RestTemplate restTemplate = new RestTemplate(); String json = JSONObject.toJSON(object).toString(); MultiValueMap postParameters = new LinkedMultiValueMap<>(); @@ -21,20 +24,21 @@ public class HttpClient { HttpHeaders headers = new HttpHeaders(); headers.add("Content-Type", "application/x-www-form-urlencoded"); HttpEntity> httpEntity = new HttpEntity<>(postParameters, headers); - System.out.println(UdidConfig.apiUrl+url); - String response = restTemplate.postForObject(UdidConfig.apiUrl+url, httpEntity,String.class); + System.out.println(UdidConfig.apiUrl + url); + String response = restTemplate.postForObject(UdidConfig.apiUrl + url, httpEntity, String.class); System.out.println(response); return response; } - public static String mipsGet(String url){ + public static String mipsGet(String url) { RestTemplate restTemplate = new RestTemplate(); String accessTokenRequestUrl = url;//"http://127.0.0.1:9997/mips/druginfo/list"; - String response = restTemplate.getForObject(accessTokenRequestUrl,String.class); + String response = restTemplate.getForObject(accessTokenRequestUrl, String.class); return response; } - public static String mipsGet(String url, Map params){ + + public static String mipsGet(String url, Map params) { StringBuffer stringBuffer = new StringBuffer(url); if (params instanceof Map) { Iterator iterator = ((Map) params).entrySet().iterator(); @@ -56,10 +60,24 @@ public class HttpClient { } RestTemplate restTemplate = new RestTemplate(); String accessTokenRequestUrl = url;//"http://127.0.0.1:9997/mips/druginfo/list"; - String response = restTemplate.getForObject(accessTokenRequestUrl,String.class); + String response = restTemplate.getForObject(accessTokenRequestUrl, String.class); return response; } + public static String uCloudPost(String url, Object object) { + RestTemplate restTemplate = new RestTemplate(); + String json = JSONObject.toJSON(object).toString(); +// MultiValueMap postParameters = new LinkedMultiValueMap<>(); +// postParameters.add("params", json); + logger.info(url + "\n" + json); + HttpHeaders headers = new HttpHeaders(); + headers.add("Content-Type", "application/json"); + HttpEntity httpEntity = new HttpEntity<>(json, headers); + logger.info(httpEntity.toString()); + String response = restTemplate.postForObject(url, httpEntity, String.class); + System.out.println(response); + return response; + } } diff --git a/api-udims/src/main/java/com/glxp/udi/admin/util/ReceiptBeanUtils.java b/api-udims/src/main/java/com/glxp/udi/admin/util/ReceiptBeanUtils.java deleted file mode 100644 index 082545d..0000000 --- a/api-udims/src/main/java/com/glxp/udi/admin/util/ReceiptBeanUtils.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.glxp.udi.admin.util; - -import com.glxp.udi.admin.entity.inout.WarehouseEntity; -import com.glxp.udi.admin.entity.receipt.ReceiptsEntity; -import com.glxp.udi.admin.entity.receipt.ReceiptsdDetailEntity; -import com.glxp.udi.admin.req.receipt.AddReceiptRequest; - -import java.util.ArrayList; -import java.util.List; - -public class ReceiptBeanUtils { - - - public static ReceiptsEntity requestToEntity(AddReceiptRequest.ReceiptRequest receiptRequest,int i) { - ReceiptsEntity receiptsEntity = new ReceiptsEntity(); - receiptsEntity.setReceiptNo(receiptRequest.getId()); - receiptsEntity.setAction(receiptRequest.getAction()); - receiptsEntity.setMainAction(receiptRequest.getMainAction()); - receiptsEntity.setUnit(receiptRequest.getFromCorp()); - receiptsEntity.setReceiptDate(receiptRequest.getActDate()); - receiptsEntity.setId(System.currentTimeMillis() + ""+i); - return receiptsEntity; - } - - public static List warehouseToReceiptDetails(String receiptsId, List warehouseEntities) { - List receiptsdDetailEntities = new ArrayList<>(); - for (int i = 0; i < warehouseEntities.size(); i++) { - WarehouseEntity warehouseEntity = warehouseEntities.get(i); - ReceiptsdDetailEntity receiptsdDetailEntity = new ReceiptsdDetailEntity(); - receiptsdDetailEntity.setReceiptId(receiptsId); - receiptsdDetailEntity.setCode(warehouseEntity.getCode()); - - receiptsdDetailEntities.add(receiptsdDetailEntity); - - } - return receiptsdDetailEntities; - } - -} diff --git a/api-udims/src/main/java/com/glxp/udi/admin/util/WarehousBeanUtils.java b/api-udims/src/main/java/com/glxp/udi/admin/util/WarehousBeanUtils.java index d526817..b3722e8 100644 --- a/api-udims/src/main/java/com/glxp/udi/admin/util/WarehousBeanUtils.java +++ b/api-udims/src/main/java/com/glxp/udi/admin/util/WarehousBeanUtils.java @@ -1,54 +1,128 @@ package com.glxp.udi.admin.util; + import com.glxp.udi.admin.entity.inout.WarehouseEntity; -import com.glxp.udi.admin.entity.inout.WarehousetempEntity; +import com.glxp.udi.admin.entity.inout.Warehousetemp; import com.glxp.udi.admin.entity.udid.*; import com.glxp.udi.admin.res.inout.WarehouseResponse; import com.glxp.udi.admin.res.udid.DataSetBean; -import org.springframework.beans.BeanUtils; import java.util.ArrayList; import java.util.List; public class WarehousBeanUtils { - public static WarehouseEntity tempToEntity(WarehousetempEntity warehousetemp) { + public static WarehouseEntity tempToEntity(Warehousetemp warehousetemp) { WarehouseEntity warehouseEntity = new WarehouseEntity(); - BeanUtils.copyProperties(warehousetemp, warehouseEntity); + + warehouseEntity.setOrderId(warehousetemp.getOrderid()); + warehouseEntity.setActDate(warehousetemp.getActdate() + ""); + warehouseEntity.setAction(warehousetemp.getAction()); + warehouseEntity.setActor(warehousetemp.getActor()); + warehouseEntity.setCode(warehousetemp.getCode()); + warehouseEntity.setCorpOrderId(warehousetemp.getCorporderid()); + warehouseEntity.setFromCorp(warehousetemp.getFromcorp()); + warehouseEntity.setFromCorpId(warehousetemp.getFromcorpid()); + warehouseEntity.setUpperCorpOrderId(warehousetemp.getUppercorporderid()); + warehouseEntity.setWrongCode(warehousetemp.getWrongcode()); + warehouseEntity.setMainAction(warehousetemp.getMainaction()); + warehouseEntity.setBatchNo(warehousetemp.getBatchno()); + warehouseEntity.setProduceDate(warehousetemp.getProducedate()); + warehouseEntity.setExpireDate(warehousetemp.getExpiredate()); + warehouseEntity.setSerialNo(warehousetemp.getSerialno()); + warehouseEntity.setUdi(warehousetemp.getUdi()); + warehouseEntity.setCustomerId(warehousetemp.getCustomerId()); + warehouseEntity.setCount(warehousetemp.getCount()); return warehouseEntity; } - public static List tempsToEntitys(List warehousetemps) { + public static List tempsToEntitys(List warehousetemps) { List warehouseEntitys = new ArrayList<>(); for (int i = 0; i < warehousetemps.size(); i++) { - WarehousetempEntity warehousetemp = warehousetemps.get(i); + Warehousetemp warehousetemp = warehousetemps.get(i); WarehouseEntity warehouseEntity = new WarehouseEntity(); - BeanUtils.copyProperties(warehousetemp, warehouseEntity); + + warehouseEntity.setOrderId(warehousetemp.getOrderid()); + warehouseEntity.setActDate(warehousetemp.getActdate()); + warehouseEntity.setAction(warehousetemp.getAction()); + warehouseEntity.setActor(warehousetemp.getActor()); + warehouseEntity.setCode(warehousetemp.getCode()); + warehouseEntity.setCorpOrderId(warehousetemp.getCorporderid()); + warehouseEntity.setFromCorp(warehousetemp.getFromcorp()); + warehouseEntity.setFromCorpId(warehousetemp.getFromcorpid()); + warehouseEntity.setUpperCorpOrderId(warehousetemp.getUppercorporderid()); + warehouseEntity.setWrongCode(warehousetemp.getWrongcode()); + warehouseEntity.setMainAction(warehousetemp.getMainaction()); + warehouseEntity.setBatchNo(warehousetemp.getBatchno()); + warehouseEntity.setProduceDate(warehousetemp.getProducedate()); + warehouseEntity.setExpireDate(warehousetemp.getExpiredate()); + warehouseEntity.setSerialNo(warehousetemp.getSerialno()); + warehouseEntity.setUdi(warehousetemp.getUdi()); + warehouseEntity.setCount(warehousetemp.getCount()); + warehouseEntity.setCustomerId(warehousetemp.getCustomerId()); warehouseEntitys.add(warehouseEntity); } return warehouseEntitys; } - public static List tempsToWarehouseResponse(List warehousetemps) { + public static List tempsToWarehouseResponse(List warehousetemps) { List warehouseEntitys = new ArrayList<>(); for (int i = 0; i < warehousetemps.size(); i++) { - WarehousetempEntity warehousetemp = warehousetemps.get(i); + Warehousetemp warehousetemp = warehousetemps.get(i); WarehouseResponse warehouseResponse = new WarehouseResponse(); - BeanUtils.copyProperties(warehousetemp, warehouseResponse); + +// warehouseEntity.setOrderId(warehousetemp.getOrderid()); + warehouseResponse.setActDate(warehousetemp.getActdate()); + warehouseResponse.setAction(warehousetemp.getAction()); + warehouseResponse.setActor(warehousetemp.getActor()); + warehouseResponse.setCode(warehousetemp.getCode()); + warehouseResponse.setCount(warehousetemp.getCount()); + warehouseResponse.setCorpOrderId(warehousetemp.getCorporderid()); + warehouseResponse.setFromCorp(warehousetemp.getFromcorp()); + warehouseResponse.setFromCorpId(warehousetemp.getFromcorpid()); + warehouseResponse.setUpperCorpOrderId(warehousetemp.getUppercorporderid()); + warehouseResponse.setWrongCode(warehousetemp.getWrongcode()); + warehouseResponse.setMainAction(warehousetemp.getMainaction()); + warehouseResponse.setId(warehousetemp.getId()); warehouseEntitys.add(warehouseResponse); } return warehouseEntitys; } - public static List entityToTemp(List warehouseEntities) { - List warehousetempList = new ArrayList<>(); + public static List entityToTemp(List warehouseEntities, long customerId) { + List warehousetempList = new ArrayList<>(); if (warehouseEntities != null) { for (int i = 0; i < warehouseEntities.size(); i++) { - WarehousetempEntity warehousetemp = new WarehousetempEntity(); + Warehousetemp warehousetemp = new Warehousetemp(); WarehouseEntity warehouseEntity = warehouseEntities.get(i); - BeanUtils.copyProperties(warehousetemp, warehouseEntity); +// String dateFormat = "yyyy-MM-dd HH:mm:ss"; +// SimpleDateFormat sdf = new SimpleDateFormat(dateFormat); +// try { +// Date date = (Date) sdf.parse(warehouseEntity.getActDate()); +// warehousetemp.setActdate(warehouseEntity.getActDate()); +// } catch (ParseException e) { +// e.printStackTrace(); +// } + warehousetemp.setActdate(warehouseEntity.getActDate()); + warehousetemp.setAction(warehouseEntity.getAction()); + warehousetemp.setActor(warehouseEntity.getActor()); + warehousetemp.setCode(warehouseEntity.getCode()); + warehousetemp.setCorporderid(warehouseEntity.getCorpOrderId()); + warehousetemp.setFromcorp(warehouseEntity.getFromCorp()); + warehousetemp.setFromcorpid(warehouseEntity.getFromCorpId()); + warehousetemp.setMainaction(warehouseEntity.getMainAction()); + warehousetemp.setOrderid(warehouseEntity.getOrderId()); + warehousetemp.setUppercorporderid(warehouseEntity.getUpperCorpOrderId()); + warehousetemp.setWrongcode(warehouseEntity.getWrongCode()); + warehousetemp.setBatchno(warehouseEntity.getBatchNo()); + warehousetemp.setProducedate(warehouseEntity.getProduceDate()); + warehousetemp.setExpiredate(warehouseEntity.getExpireDate()); + warehousetemp.setSerialno(warehouseEntity.getSerialNo()); + warehousetemp.setUdi(warehouseEntity.getUdi()); + warehousetemp.setCount(warehouseEntity.getCount()); + warehousetemp.setCustomerId(customerId); warehousetempList.add(warehousetemp); } } @@ -91,7 +165,7 @@ public class WarehousBeanUtils { device.setTsccsm(dataSetBean.getTsccsm()); device.setTsrq(dataSetBean.getTsrq()); device.setTyshxydm(dataSetBean.getTyshxydm()); - device.setVersionnumber(dataSetBean.getVersionNumber()+""); + device.setVersionnumber(dataSetBean.getVersionNumber() + ""); device.setVersionstatus(dataSetBean.getVersionStatus()); device.setVersiontime(dataSetBean.getVersionTime()); device.setYbbm(dataSetBean.getYbbm()); diff --git a/api-udims/src/main/resources/application-pro.properties b/api-udims/src/main/resources/application-pro.properties index 3c4382f..ac7affe 100644 --- a/api-udims/src/main/resources/application-pro.properties +++ b/api-udims/src/main/resources/application-pro.properties @@ -16,4 +16,7 @@ cors.allowed-Credentials = true #mips服务地址 UDIC_MIPSDOWNLOAD_URL = http://127.0.0.1:8080/UDIC_MIPSDL_Server - +UDI_SERVER_URL=http://127.0.0.1:8080/UDI_DL_Server +UCLOD_SERVER_URL=http://127.0.0.1:9997 +#UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server +COOR_UPLOAD_ORDER=http://127.0.0.1:9987/udi/upload diff --git a/api-udims/src/main/resources/logback-spring.xml b/api-udims/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..9e1529d --- /dev/null +++ b/api-udims/src/main/resources/logback-spring.xml @@ -0,0 +1,145 @@ + + + logback + + + + + + %d{HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + ${log.path}/web_debug.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/web-debug-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + debug + ACCEPT + DENY + + + + + + + ${log.path}/web_info.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/web-info-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + info + ACCEPT + DENY + + + + + + + ${log.path}/web_warn.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/web-warn-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + warn + ACCEPT + DENY + + + + + + + ${log.path}/web_error.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/web-error-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + ERROR + ACCEPT + DENY + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/api-udims/src/main/resources/mybatis/mapper/auth/AuthPermissionRuleDao.xml b/api-udims/src/main/resources/mybatis/mapper/auth/AuthPermissionRuleDao.xml index 87f3e5d..85f2f64 100644 --- a/api-udims/src/main/resources/mybatis/mapper/auth/AuthPermissionRuleDao.xml +++ b/api-udims/src/main/resources/mybatis/mapper/auth/AuthPermissionRuleDao.xml @@ -4,7 +4,7 @@ + diff --git a/api-udims/src/main/resources/mybatis/mapper/inout/MyErpOrderDao.xml b/api-udims/src/main/resources/mybatis/mapper/inout/MyErpOrderDao.xml new file mode 100644 index 0000000..485585a --- /dev/null +++ b/api-udims/src/main/resources/mybatis/mapper/inout/MyErpOrderDao.xml @@ -0,0 +1,181 @@ + + + + + + + + + + + + + + + + + + + + + + + + replace INTO io_order_detail(id, + companyid,docid,iodtlid,inoutid,goodsunit,goodsid,lotid,goodsname,companyname, + lotno,dtlgoodsqty,credate,nameCode,productCompany, + coName,authCode,packSpec,packRatio,bhzxxsbzsl,zxxsbzbhsydysl,orderIdFk,count,reCount) + values( + #{id}, + #{companyid}, + #{docid}, + #{iodtlid}, + #{inoutid}, + #{goodsunit}, + #{goodsid}, + #{lotid}, + #{goodsname}, + #{companyname}, + #{lotno}, + #{dtlgoodsqty}, + #{credate}, + #{nameCode},#{productCompany},#{coName},#{authCode},#{packSpec},#{packRatio}, + #{bhzxxsbzsl},#{zxxsbzbhsydysl},#{orderIdFk},#{count},#{reCount} + ) + + + + replace INTO io_order_detail(id, + companyid,docid,iodtlid,inoutid,goodsunit,goodsid,lotid,goodsname,companyname, + lotno,dtlgoodsqty,credate,nameCode,productCompany, + coName,authCode,packSpec,packRatio,bhzxxsbzsl,zxxsbzbhsydysl,orderIdFk,count,reCount) + values + + + ( + #{item.id}, + #{item.companyid}, + #{item.docid}, + #{item.iodtlid}, + #{item.inoutid}, + #{item.goodsunit}, + #{item.goodsid}, + #{item.lotid}, + #{item.goodsname}, + #{item.companyname}, + #{item.lotno}, + #{item.dtlgoodsqty}, #{item.credate}, + #{item.nameCode}, #{item.productCompany}, #{item.coName}, #{item.authCode}, #{item.packSpec}, + #{item.packRatio}, #{item.bhzxxsbzsl}, + #{item.zxxsbzbhsydysl}, #{item.orderIdFk}, #{item.count},#{item.reCount}) + + + + + UPDATE io_order_detail + + count=#{count}, + reCount=#{reCount}, + + WHERE id = #{id} + + + DELETE FROM io_order_detail WHERE docid = #{id} + + + + DELETE FROM io_order_detail WHERE id = #{id} + + + + DELETE FROM io_order_detail WHERE orderIdFk = #{id} + + + + \ No newline at end of file diff --git a/api-udims/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-udims/src/main/resources/mybatis/mapper/inout/OrderDao.xml index c6fe847..8af6c8c 100644 --- a/api-udims/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-udims/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -6,26 +6,27 @@ - INSERT INTO order_info(id,action,corpOrderId,actDate,fromCorpId,actor,mainAction,fromCorp,status,remark,exportStatus) + insert INTO io_order_info(id,action,corpOrderId,actDate,fromCorpId,actor,mainAction, + fromCorp,status,remark,exportStatus,fromType,contrastStatus,signStatus,erpFk,stockCheckFk,customerId) values( #{id}, #{action}, @@ -37,56 +38,133 @@ where corpOrderId in (select corpOrderId from order_info group by corpOrderId HA #{fromCorp}, #{status}, #{remark}, - #{exportStatus}) + #{exportStatus}, + #{fromType}, + #{contrastStatus}, + #{signStatus}, + #{erpFk}, + #{stockCheckFk},#{customerId}) - + + UPDATE io_order_info + + action=#{action}, + corpOrderId=#{corpOrderId}, + actDate=#{actDate}, + fromCorpId=#{fromCorpId}, + actor=#{actor}, + mainAction=#{mainAction}, + fromCorp=#{fromCorp}, + status=#{status}, + remark=#{remark}, + exportStatus=#{exportStatus}, + fromType=#{fromType}, + contrastStatus=#{contrastStatus}, + erpFk=#{erpFk}, + signStatus=#{signStatus} + stockCheckFk=#{stockCheckFk} + + WHERE id = #{id} + - DELETE FROM order_info WHERE id = #{orderId} + DELETE FROM io_order_info WHERE id = #{orderId} - DELETE FROM order_info WHERE id = #{id} + DELETE FROM io_order_info WHERE id = #{id} - UPDATE order_info SET fromCorpId = #{fromCorpId},fromCorp = #{fromCorp} where id = #{id} + UPDATE io_order_info SET fromCorpId = #{fromCorpId},fromCorp = #{fromCorp} where id = #{id} - UPDATE order_info SET `status` = #{status} where id = #{orderId} + UPDATE io_order_info SET `status` = #{status} where id = #{orderId} - UPDATE order_info SET `exportStatus` = #{exportStatus} where id = #{orderId} + UPDATE io_order_info SET `exportStatus` = #{exportStatus} where id = #{orderId} + + + UPDATE io_order_info SET `contrastStatus` = #{contrastStatus} where id = #{orderId} + + + UPDATE io_order_info SET `signStatus` = #{signStatus} where id = #{orderId} - - UPDATE order_info SET `remark` = #{remark} where id = #{orderId} + UPDATE io_order_info SET `remark` = #{remark} where id = #{orderId} - + + + \ No newline at end of file diff --git a/api-udims/src/main/resources/mybatis/mapper/inout/SetupDao.xml b/api-udims/src/main/resources/mybatis/mapper/inout/SetupDao.xml new file mode 100644 index 0000000..51e8fa3 --- /dev/null +++ b/api-udims/src/main/resources/mybatis/mapper/inout/SetupDao.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + UPDATE io_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} + + + WHERE id=#{id} + + + + + + insert INTO io_system_config(erpSaleOutModify, + erpGetSaleOut,erpSaleOutSign,filterSaleOutSign,erpGetSaleOutDay,erpPruchaseModify, + erpGetPurchaseIn,erpPruchaseSign, + erpGetPurchaseDay,filterPurchaseSign,remark,forbidSameErp, + returnWareHouseOut,salesWareHouseOut,returnWareHouseIn,updateErpData + ) values + ( + #{erpSaleOutModify},#{erpGetSaleOut}, #{erpSaleOutSign}, + #{filterSaleOutSign}, #{erpGetSaleOutDay},#{erpPruchaseModify}, #{erpGetPurchaseIn}, + #{erpPruchaseSign}, + #{erpGetPurchaseDay}, #{filterPurchaseSign}, + #{remark},#{forbidSameErp} + ,#{returnWareHouseOut},#{salesWareHouseOut},#{returnWareHouseIn},#{updateErpData}) + + + + \ No newline at end of file diff --git a/api-udims/src/main/resources/mybatis/mapper/inout/UdiInfoDao.xml b/api-udims/src/main/resources/mybatis/mapper/inout/UdiInfoDao.xml new file mode 100644 index 0000000..4788eeb --- /dev/null +++ b/api-udims/src/main/resources/mybatis/mapper/inout/UdiInfoDao.xml @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + replace INTO io_productinfo + ( + nameCode,packRatio,packLevel,bhxjsl, + bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey,isUseDy, + cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber + ,diType,customerId + ) + values + ( + #{nameCode}, + #{packRatio}, + #{packLevel}, + #{bhxjsl}, + #{bhzxxsbzsl}, + #{zxxsbzbhsydysl}, + #{bhxjcpbm}, + #{bzcj}, + #{addType}, + #{deviceRecordKey}, + #{isUseDy}, + #{cpmctymc}, + #{cplb}, + #{flbm}, + #{ggxh}, + #{qxlb}, + #{tyshxydm}, + #{ylqxzcrbarmc}, + #{zczbhhzbapzbh}, + #{ylqxzcrbarywmc}, + #{uuid}, + #{sjcpbm}, + #{versionNumber}, + #{diType}, + #{customerId} + ) + + + + replace INTO io_productinfo + ( + nameCode,packRatio,packLevel,bhxjsl, + bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey,isUseDy, + cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber + ,diType,customerId + ) + values + + + ( + #{item.nameCode}, + #{item.packRatio}, + #{item.packLevel}, + #{item.bhxjsl}, + #{item.bhzxxsbzsl}, + #{item.zxxsbzbhsydysl}, + #{item.bhxjcpbm}, + #{item.bzcj}, + #{item.addType}, + #{item.deviceRecordKey}, + #{item.isUseDy}, + #{item.cpmctymc}, + #{item.cplb}, + #{item.flbm}, + #{item.ggxh}, + #{item.qxlb}, + #{item.tyshxydm}, + #{item.ylqxzcrbarmc}, + #{item.zczbhhzbapzbh}, + #{item.ylqxzcrbarywmc}, + #{item.uuid}, + #{item.sjcpbm}, + #{item.versionNumber}, + #{item.diType}, + #{item.customerId} + ) + + + + + DELETE FROM io_productinfo WHERE id = #{id} + + + + DELETE FROM io_productinfo WHERE uuid = #{uuid} + + + + UPDATE io_productinfo + + packRatio=#{packRatio}, + packLevel=#{packLevel}, + bhxjsl=#{bhxjsl}, + bhzxxsbzsl=#{bhzxxsbzsl}, + zxxsbzbhsydysl=#{zxxsbzbhsydysl}, + bhxjcpbm=#{bhxjcpbm}, + bzcj=#{bzcj}, + addType=#{addType}, + deviceRecordKey=#{deviceRecordKey}, + isUseDy=#{isUseDy}, + cpmctymc=#{cpmctymc}, + cplb=#{cplb}, + flbm=#{flbm}, + ggxh=#{ggxh}, + qxlb=#{qxlb}, + tyshxydm=#{tyshxydm}, + ylqxzcrbarmc=#{ylqxzcrbarmc}, + ylqxzcrbarywmc=#{ylqxzcrbarywmc}, + uuid=#{uuid}, + sjcpbm=#{sjcpbm}, + versionNumber=#{versionNumber}, + diType=#{diType}, + + WHERE nameCode = #{nameCode} + + + + UPDATE io_productinfo + + zxxsbzbhsydysl=#{zxxsbzbhsydysl}, + isUseDy=#{isUseDy}, + + WHERE uuid = #{uuid} + + \ No newline at end of file diff --git a/api-udims/src/main/resources/mybatis/mapper/inout/UdiRelevanceDao.xml b/api-udims/src/main/resources/mybatis/mapper/inout/UdiRelevanceDao.xml new file mode 100644 index 0000000..4a83d8d --- /dev/null +++ b/api-udims/src/main/resources/mybatis/mapper/inout/UdiRelevanceDao.xml @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + replace INTO udi_relevance + ( + thirdId,thirdName,uuid,isUseDy,updateTime,batchNo,warehouseName + ) + values + ( + #{thirdId}, + #{thirdName}, + #{uuid}, + #{isUseDy}, + #{updateTime}, + #{batchNo}, + #{warehouseName} + ) + + + + + DELETE FROM udi_relevance WHERE id = #{id} + + + DELETE FROM udi_relevance WHERE id in + + #{item} + + + + DELETE FROM udi_relevance WHERE uuid = #{uuid} + + + + UPDATE udi_relevance + + thirdId=#{thirdId}, + thirdName=#{thirdName}, + uuid=#{uuid}, + isUseDy=#{isUseDy}, + updateTime=#{updateTime}, + batchNo=#{batchNo}, + warehouseName=#{warehouseName}, + + WHERE id = #{id} + + \ No newline at end of file diff --git a/api-udims/src/main/resources/mybatis/mapper/inout/UnitMaintainDao.xml b/api-udims/src/main/resources/mybatis/mapper/inout/UnitMaintainDao.xml new file mode 100644 index 0000000..f81d30d --- /dev/null +++ b/api-udims/src/main/resources/mybatis/mapper/inout/UnitMaintainDao.xml @@ -0,0 +1,62 @@ + + + + + + + + + + replace INTO io_unit_maintain + (thirdId,unitId,name,spell, + addr,status,type,customerId,creditNo) + values + ( + #{thirdId}, + #{unitId}, + #{name}, + #{spell}, + #{addr}, + #{status}, + #{type},#{customerId},#{creditNo} + ) + + + + DELETE FROM io_unit_maintain WHERE id = #{id} + + + + + + + + UPDATE io_unit_maintain + + thirdId=#{thirdId}, + unitId=#{unitId}, + name=#{name}, + spell=#{spell}, + addr=#{addr}, + status=#{status}, + type=#{type}, + creditNo=#{creditNo}, + + WHERE id = #{id} + + diff --git a/api-udims/src/main/resources/mybatis/mapper/inout/WarehouseDao.xml b/api-udims/src/main/resources/mybatis/mapper/inout/WarehouseDao.xml index c5d569b..9ad474d 100644 --- a/api-udims/src/main/resources/mybatis/mapper/inout/WarehouseDao.xml +++ b/api-udims/src/main/resources/mybatis/mapper/inout/WarehouseDao.xml @@ -6,34 +6,39 @@ - INSERT INTO warehouse(action,mainAction,code,corpOrderId,actor,actDate,wrongCode,upperCorpOrderId,fromCorpId,fromCorp,type) + INSERT INTO io_warehouse(action,mainAction,code,corpOrderId,actor,actDate, + wrongCode,upperCorpOrderId,fromCorpId,fromCorp,type,customerId) values( #{action}, #{mainAction}, @@ -44,11 +49,11 @@ #{wrongCode}, #{upperCorpOrderId}, #{fromCorpId}, - #{fromCorp},#{orderId},#{type}) + #{fromCorp},#{orderId},#{type},#{customerId}) - INSERT INTO warehouse + INSERT INTO io_warehouse (action, mainAction, code, @@ -57,7 +62,7 @@ actDate, wrongCode, upperCorpOrderId, - fromCorpID,fromCorp,orderId,batchNo,produceDate,expireDate,serialNo,udi,count,type) + fromCorpId,fromCorp,orderId,batchNo,produceDate,expireDate,serialNo,udi,count,type,customerId) VALUES @@ -70,7 +75,7 @@ #{item.actDate}, #{item.wrongCode}, #{item.upperCorpOrderId}, - #{item.fromCorpID}, + #{item.fromCorpId}, #{ item.fromCorp },#{item.orderId},#{item.batchNo} @@ -79,27 +84,40 @@ ,#{item.serialNo} ,#{item.udi} ,#{item.count} - ,#{item.type}) + ,#{item.type},#{item.customerId}) - + SELECT * FROM io_warehouse WHERE `code`= #{code} AND 'action' ]]> 'StockCheck' and customerId = #{customerId} + + - UPDATE warehouse SET orderId = #{newOrderId} where orderId = #{oldOrderId} + UPDATE io_warehouse SET orderId = #{newOrderId} where orderId = #{oldOrderId} - UPDATE warehouse SET fromCorpID = #{fromCorpID}, fromCorp = #{fromCorp} -WHERE orderId = #{orderId} + UPDATE io_warehouse SET fromCorpID = #{fromCorpID}, fromCorp = #{fromCorp} + WHERE orderId = #{orderId} + + \ No newline at end of file diff --git a/api-udims/src/main/resources/mybatis/mapper/inout/WarehousetempDao.xml b/api-udims/src/main/resources/mybatis/mapper/inout/WarehousetempDao.xml index 4a54391..3fd6566 100644 --- a/api-udims/src/main/resources/mybatis/mapper/inout/WarehousetempDao.xml +++ b/api-udims/src/main/resources/mybatis/mapper/inout/WarehousetempDao.xml @@ -5,15 +5,15 @@ - INSERT INTO warehousetemp + INSERT INTO io_warehousetemp (action, mainAction, code, corpOrderId, actor, actDate, wrongCode, upperCorpOrderId, - fromCorpID, fromCorp, orderId,batchNo,produceDate,expireDate,serialNo,udi,count,type,oddCount) + fromCorpID, fromCorp, orderId,batchNo,produceDate,expireDate,serialNo,udi,count,type,oddCount,customerId) VALUES @@ -38,17 +38,18 @@ ,#{item.count} ,#{item.type} ,#{item.oddCount} + ,#{item.customerId} ) - DELETE FROM warehousetemp WHERE id IN + DELETE FROM io_warehousetemp WHERE id IN #{item} diff --git a/api-udims/src/main/resources/mybatis/mapper/inout/WarehousetempMapper.xml b/api-udims/src/main/resources/mybatis/mapper/inout/WarehousetempMapper.xml new file mode 100644 index 0000000..0e64bae --- /dev/null +++ b/api-udims/src/main/resources/mybatis/mapper/inout/WarehousetempMapper.xml @@ -0,0 +1,485 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, action, mainAction, code, corpOrderId, actor, actDate, wrongCode, upperCorpOrderId, + fromCorpID, fromCorp, orderId, batchNo, produceDate, expireDate, serialNo, udi, count,type,customerId + + + + + delete from io_warehousetemp + where id = #{id,jdbcType=BIGINT} + + + delete from io_warehousetemp + + + + + + insert into io_warehousetemp (id, action, mainAction, + code, corpOrderId, actor, + actDate, wrongCode, upperCorpOrderId, + fromCorpID, fromCorp, orderId, + batchNo, produceDate, expireDate, + serialNo, udi, count,type,customerId + ) + values (#{id,jdbcType=BIGINT}, #{action,jdbcType=VARCHAR}, #{mainaction,jdbcType=VARCHAR}, + #{code,jdbcType=VARCHAR}, #{corporderid,jdbcType=VARCHAR}, #{actor,jdbcType=VARCHAR}, + #{actdate,jdbcType=VARCHAR}, #{wrongcode,jdbcType=INTEGER}, #{uppercorporderid,jdbcType=VARCHAR}, + #{fromcorpid,jdbcType=VARCHAR}, #{fromcorp,jdbcType=VARCHAR}, #{orderid,jdbcType=VARCHAR}, + #{batchno,jdbcType=VARCHAR}, #{producedate,jdbcType=VARCHAR}, #{expiredate,jdbcType=VARCHAR}, + #{serialno,jdbcType=VARCHAR}, #{udi,jdbcType=VARCHAR}, #{count,jdbcType=INTEGER},#{type,jdbcType=INTEGER},#{customerId} + ) + + + insert into io_warehousetemp + + + id, + + + action, + + + mainAction, + + + code, + + + corpOrderId, + + + actor, + + + actDate, + + + wrongCode, + + + upperCorpOrderId, + + + fromCorpID, + + + fromCorp, + + + orderId, + + + batchNo, + + + produceDate, + + + expireDate, + + + serialNo, + + + udi, + + + count, + + + type, + + + + + #{id,jdbcType=BIGINT}, + + + #{action,jdbcType=VARCHAR}, + + + #{mainaction,jdbcType=VARCHAR}, + + + #{code,jdbcType=VARCHAR}, + + + #{corporderid,jdbcType=VARCHAR}, + + + #{actor,jdbcType=VARCHAR}, + + + #{actdate,jdbcType=VARCHAR}, + + + #{wrongcode,jdbcType=INTEGER}, + + + #{uppercorporderid,jdbcType=VARCHAR}, + + + #{fromcorpid,jdbcType=VARCHAR}, + + + #{fromcorp,jdbcType=VARCHAR}, + + + #{orderid,jdbcType=VARCHAR}, + + + #{batchno,jdbcType=VARCHAR}, + + + #{producedate,jdbcType=VARCHAR}, + + + #{expiredate,jdbcType=VARCHAR}, + + + #{serialno,jdbcType=VARCHAR}, + + + #{udi,jdbcType=VARCHAR}, + + + #{count,jdbcType=INTEGER}, + + + #{type,jdbcType=INTEGER}, + + + + + + update io_warehousetemp + + + id = #{record.id,jdbcType=BIGINT}, + + + action = #{record.action,jdbcType=VARCHAR}, + + + mainAction = #{record.mainaction,jdbcType=VARCHAR}, + + + code = #{record.code,jdbcType=VARCHAR}, + + + corpOrderId = #{record.corporderid,jdbcType=VARCHAR}, + + + actor = #{record.actor,jdbcType=VARCHAR}, + + + actDate = #{record.actdate,jdbcType=VARCHAR}, + + + wrongCode = #{record.wrongcode,jdbcType=INTEGER}, + + + upperCorpOrderId = #{record.uppercorporderid,jdbcType=VARCHAR}, + + + fromCorpID = #{record.fromcorpid,jdbcType=VARCHAR}, + + + fromCorp = #{record.fromcorp,jdbcType=VARCHAR}, + + + orderId = #{record.orderid,jdbcType=VARCHAR}, + + + batchNo = #{record.batchno,jdbcType=VARCHAR}, + + + produceDate = #{record.producedate,jdbcType=VARCHAR}, + + + expireDate = #{record.expiredate,jdbcType=VARCHAR}, + + + serialNo = #{record.serialno,jdbcType=VARCHAR}, + + + udi = #{record.udi,jdbcType=VARCHAR}, + + + count = #{record.count,jdbcType=INTEGER}, + + + type = #{record.type,jdbcType=INTEGER}, + + + + + + + + update io_warehousetemp + set id = #{record.id,jdbcType=BIGINT}, + action = #{record.action,jdbcType=VARCHAR}, + mainAction = #{record.mainaction,jdbcType=VARCHAR}, + code = #{record.code,jdbcType=VARCHAR}, + corpOrderId = #{record.corporderid,jdbcType=VARCHAR}, + actor = #{record.actor,jdbcType=VARCHAR}, + actDate = #{record.actdate,jdbcType=VARCHAR}, + wrongCode = #{record.wrongcode,jdbcType=INTEGER}, + upperCorpOrderId = #{record.uppercorporderid,jdbcType=VARCHAR}, + fromCorpID = #{record.fromcorpid,jdbcType=VARCHAR}, + fromCorp = #{record.fromcorp,jdbcType=VARCHAR}, + orderId = #{record.orderid,jdbcType=VARCHAR}, + batchNo = #{record.batchno,jdbcType=VARCHAR}, + produceDate = #{record.producedate,jdbcType=VARCHAR}, + expireDate = #{record.expiredate,jdbcType=VARCHAR}, + serialNo = #{record.serialno,jdbcType=VARCHAR}, + udi = #{record.udi,jdbcType=VARCHAR}, + count = #{record.count,jdbcType=INTEGER, + type = #{record.type,jdbcType=INTEGER} + + + + + + update io_warehousetemp + + + action = #{action,jdbcType=VARCHAR}, + + + mainAction = #{mainaction,jdbcType=VARCHAR}, + + + code = #{code,jdbcType=VARCHAR}, + + + corpOrderId = #{corporderid,jdbcType=VARCHAR}, + + + actor = #{actor,jdbcType=VARCHAR}, + + + actDate = #{actdate,jdbcType=VARCHAR}, + + + wrongCode = #{wrongcode,jdbcType=INTEGER}, + + + upperCorpOrderId = #{uppercorporderid,jdbcType=VARCHAR}, + + + fromCorpID = #{fromcorpid,jdbcType=VARCHAR}, + + + fromCorp = #{fromcorp,jdbcType=VARCHAR}, + + + orderId = #{orderid,jdbcType=VARCHAR}, + + + batchNo = #{batchno,jdbcType=VARCHAR}, + + + produceDate = #{producedate,jdbcType=VARCHAR}, + + + expireDate = #{expiredate,jdbcType=VARCHAR}, + + + serialNo = #{serialno,jdbcType=VARCHAR}, + + + udi = #{udi,jdbcType=VARCHAR}, + + + count = #{count,jdbcType=INTEGER}, + + + + type = #{type,jdbcType=INTEGER}, + + + where id = #{id,jdbcType=BIGINT} + + + update io_warehousetemp + set action = #{action,jdbcType=VARCHAR}, + mainAction = #{mainaction,jdbcType=VARCHAR}, + code = #{code,jdbcType=VARCHAR}, + corpOrderId = #{corporderid,jdbcType=VARCHAR}, + actor = #{actor,jdbcType=VARCHAR}, + actDate = #{actdate,jdbcType=VARCHAR}, + wrongCode = #{wrongcode,jdbcType=INTEGER}, + upperCorpOrderId = #{uppercorporderid,jdbcType=VARCHAR}, + fromCorpID = #{fromcorpid,jdbcType=VARCHAR}, + fromCorp = #{fromcorp,jdbcType=VARCHAR}, + orderId = #{orderid,jdbcType=VARCHAR}, + batchNo = #{batchno,jdbcType=VARCHAR}, + produceDate = #{producedate,jdbcType=VARCHAR}, + expireDate = #{expiredate,jdbcType=VARCHAR}, + serialNo = #{serialno,jdbcType=VARCHAR}, + udi = #{udi,jdbcType=VARCHAR}, + count = #{count,jdbcType=INTEGER}, + type = #{type,jdbcType=INTEGER}, + where id = #{id,jdbcType=BIGINT} and customerId = #{customerId} + + + + + INSERT INTO io_warehousetemp + (action, mainAction, + code, corpOrderId, actor, + actDate, wrongCode, upperCorpOrderId, + fromCorpID, fromCorp, orderId,batchNo,produceDate,expireDate,serialNo,udi,count,type,customerId) + VALUES + + ( + #{item.action}, + #{item.mainaction}, + #{item.code}, + #{item.corporderid}, + #{item.actor}, + #{item.actdate}, + #{item.wrongcode}, + #{item.uppercorporderid}, + #{item.fromcorpid}, + #{ + item.fromcorp + },#{item.orderid} + ,#{item.batchno} + ,#{item.producedate} + ,#{item.expiredate} + ,#{item.serialno} + ,#{item.udi} + ,#{item.count} + ,#{item.type},#{item.customerId} + ) + + + + + + DELETE FROM io_warehousetemp WHERE id IN + + #{item} + + + \ No newline at end of file diff --git a/api-udims/src/main/resources/mybatis/mapper/receipt/UnitMaintainDao.xml b/api-udims/src/main/resources/mybatis/mapper/receipt/UnitMaintainDao.xml deleted file mode 100644 index 2def2b5..0000000 --- a/api-udims/src/main/resources/mybatis/mapper/receipt/UnitMaintainDao.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - INSERT INTO unit_maintain - (thirdId,unitId,name,spell, - addr,status,type) - values - ( - #{thirdId}, - #{unitId}, - #{name}, - #{spell}, - #{addr}, - #{status}, - #{type} - ) - - - - DELETE FROM unit_maintain WHERE id = #{id} - - - - -