From 07d04c41015a6d62f32383f1f84d7b45be459790 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 6 Aug 2021 14:08:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api-admin/pom.xml | 5 +- .../api/admin/config/WebSocketConfig.java | 12 ++ .../api/admin/config/WebSocketServer.java | 125 ++++++++++++ .../basic/BasicThirdSysController.java | 62 ++++++ .../basic/BasicUnitMaintainController.java | 84 ++++++-- .../basic/BussinessTypeController.java | 19 ++ .../controller/basic/UdiInfoController.java | 16 +- .../basic/UdiRelevanceController.java | 188 +++++++++++++++--- .../controller/inout/OrderController.java | 122 ++++++------ .../inout/OrderDetailController.java | 17 +- .../controller/inout/WareHouseController.java | 1 + .../inventory/InvErpOnhandController.java | 25 ++- .../inventory/InvPrintController.java | 26 ++- .../controller/thrsys/ThrCorpsController.java | 76 +++++++ .../thrsys/ThrInvProductsController.java | 76 +++++++ .../controller/thrsys/ThrOrderController.java | 111 +++++++++++ .../thrsys/ThrProductsController.java | 72 +++++++ .../api/admin/dao/basic/BasicThirdSysDao.java | 20 ++ .../admin/dao/basic/BasicUnitMaintainDao.java | 4 +- .../api/admin/dao/basic/BussinessTypeDao.java | 3 + .../glxp/api/admin/dao/thrsys/ThrCorpDao.java | 23 +++ .../admin/dao/thrsys/ThrInvProductsDao.java | 23 +++ .../api/admin/dao/thrsys/ThrOrderDao.java | 22 ++ .../admin/dao/thrsys/ThrOrderDetailDao.java | 23 +++ .../api/admin/dao/thrsys/ThrProductsDao.java | 24 +++ .../entity/basic/BasicThirdSysEntity.java | 27 +++ .../entity/basic/BasicUnitMaintainEntity.java | 7 +- .../entity/basic/BussinessTypeEntity.java | 1 + .../entity/basic/UdiRelevanceEntity.java | 11 + .../admin/entity/info/WebSocketEntity.java | 14 ++ .../admin/entity/thrsys/ThrCorpEntity.java | 19 ++ .../entity/thrsys/ThrInvProductsEntity.java | 22 ++ .../entity/thrsys/ThrOrderDetailEntity.java | 19 ++ .../admin/entity/thrsys/ThrOrderEntity.java | 17 ++ .../entity/thrsys/ThrProductsEntity.java | 16 ++ .../api/admin/httpclient/ErpBasicClient.java | 3 +- .../api/admin/httpclient/ErpOrderClient.java | 11 +- .../api/admin/req/basic/CombineRequest.java | 1 + .../req/basic/CombineSingleUnitRequest.java | 11 + .../req/basic/FilterBasicThirdSysRequest.java | 13 ++ .../req/basic/FilterErpGoodsRequest.java | 1 + .../req/basic/PostSmpUdiInfoRequest.java | 180 +---------------- .../req/basic/PostThirdSysPiRequest.java | 11 + .../admin/req/inout/ERPPostBillRequest.java | 3 +- .../admin/req/inventory/ErpOnhandRequest.java | 2 +- .../receipt/BussinessTypeFilterRequest.java | 2 +- .../admin/req/receipt/CombineUnitRequest.java | 2 +- .../receipt/UnitMaintainFilterRequest.java | 1 + .../req/thrsys/FilterThrCorpRequest.java | 11 + .../thrsys/FilterThrInvProductsRequest.java | 12 ++ .../thrsys/FilterThrOrderDetailRequest.java | 13 ++ .../req/thrsys/FilterThrOrderRequest.java | 12 ++ .../req/thrsys/FilterThrProductsRequest.java | 10 + .../admin/req/thrsys/PostThrCorpRequest.java | 12 ++ .../req/thrsys/PostThrInvProductsRequest.java | 13 ++ .../admin/req/thrsys/PostThrOrderRequest.java | 14 ++ .../req/thrsys/PostThrProductsRequest.java | 14 ++ .../basic/BasicProductThirdSysResponse.java | 10 + .../admin/res/basic/BussinessTypResponse.java | 33 +++ .../admin/res/basic/ErpProductsResponse.java | 1 + .../admin/res/basic/UdiRelevanceResponse.java | 8 + .../api/admin/res/inout/ErpOrderResponse.java | 17 +- .../res/inventory/ErpInvProductResponse.java | 5 +- .../service/basic/BasicThirdSysService.java | 18 ++ .../basic/BasicUnitMaintainService.java | 4 +- .../service/basic/BussinessTypeService.java | 7 +- .../basic/impl/BasicThirdSysServiceImpl.java | 43 ++++ .../impl/BasicUnitMaintainServiceImpl.java | 7 +- .../basic/impl/BussinessTypeServiceImpl.java | 26 +++ .../admin/service/thrsys/ThrCorpService.java | 20 ++ .../service/thrsys/ThrInvProductsService.java | 21 ++ .../service/thrsys/ThrOrderDetailService.java | 21 ++ .../admin/service/thrsys/ThrOrderService.java | 22 ++ .../service/thrsys/ThrProductsService.java | 21 ++ .../thrsys/impl/ThrCorpServiceImpl.java | 52 +++++ .../impl/ThrInvProductsServiceImpl.java | 54 +++++ .../impl/ThrOrderDetailServiceImpl.java | 53 +++++ .../thrsys/impl/ThrOrderServiceImpl.java | 63 ++++++ .../thrsys/impl/ThrProductsServiceImpl.java | 54 +++++ .../admin/thread/BasicUpdateErpDataTask.java | 20 +- .../thread/BasicUpdateproductService.java | 20 +- .../admin/thread/InvImportStockService.java | 20 +- .../api/admin/thread/IoModifyErpTask.java | 53 +++-- .../api/admin/thread/IoTransInoutService.java | 20 +- .../mybatis/mapper/basic/BasicThirdSysDao.xml | 50 +++++ .../mapper/basic/BasicUnitMaintainDao.xml | 32 +-- .../mybatis/mapper/basic/BussinessTypeDao.xml | 35 +++- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 27 ++- .../mybatis/mapper/thrsys/ThrCorpDao.xml | 86 ++++++++ .../mapper/thrsys/ThrInvProductsDao.xml | 83 ++++++++ .../mybatis/mapper/thrsys/ThrOrderDao.xml | 81 ++++++++ .../mapper/thrsys/ThrOrderDetailDao.xml | 74 +++++++ .../mybatis/mapper/thrsys/ThrProductsDao.xml | 78 ++++++++ .../com/glxp/api/admin/util/JwtUtilsTest.java | 2 + 94 files changed, 2507 insertions(+), 418 deletions(-) create mode 100644 api-admin/src/main/java/com/glxp/api/admin/config/WebSocketConfig.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/config/WebSocketServer.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpsController.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvProductsController.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderController.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsController.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicThirdSysDao.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpDao.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvProductsDao.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDao.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDetailDao.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsDao.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysEntity.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/entity/info/WebSocketEntity.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrCorpEntity.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvProductsEntity.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderDetailEntity.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderEntity.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrProductsEntity.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/basic/CombineSingleUnitRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterBasicThirdSysRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/basic/PostThirdSysPiRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrCorpRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvProductsRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrOrderDetailRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrOrderRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrProductsRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrCorpRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrInvProductsRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrOrderRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrProductsRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/res/basic/BasicProductThirdSysResponse.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicThirdSysService.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysServiceImpl.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpService.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvProductsService.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderDetailService.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderService.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsService.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpServiceImpl.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvProductsServiceImpl.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderDetailServiceImpl.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderServiceImpl.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsServiceImpl.java create mode 100644 api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml create mode 100644 api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml create mode 100644 api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml create mode 100644 api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml create mode 100644 api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml create mode 100644 api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml diff --git a/api-admin/pom.xml b/api-admin/pom.xml index deaec4c7..7bbe118d 100644 --- a/api-admin/pom.xml +++ b/api-admin/pom.xml @@ -79,7 +79,6 @@ runtime - com.oracle ojdbc6 @@ -157,6 +156,10 @@ pagehelper-spring-boot-autoconfigure 1.2.5 + + org.springframework.boot + spring-boot-starter-websocket + diff --git a/api-admin/src/main/java/com/glxp/api/admin/config/WebSocketConfig.java b/api-admin/src/main/java/com/glxp/api/admin/config/WebSocketConfig.java new file mode 100644 index 00000000..f9a12734 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/config/WebSocketConfig.java @@ -0,0 +1,12 @@ +package com.glxp.api.admin.config; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; + +@Configuration +public class WebSocketConfig { + @Bean + public ServerEndpointExporter serverEndpointExporter() { + return new ServerEndpointExporter(); + } +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/config/WebSocketServer.java b/api-admin/src/main/java/com/glxp/api/admin/config/WebSocketServer.java new file mode 100644 index 00000000..326f3c7a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/config/WebSocketServer.java @@ -0,0 +1,125 @@ +package com.glxp.api.admin.config; + + +import com.alibaba.fastjson.JSON; +import com.glxp.api.admin.entity.info.WebSocketEntity; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.stereotype.Service; + +import javax.websocket.*; +import javax.websocket.server.PathParam; +import javax.websocket.server.ServerEndpoint; +import java.io.IOException; +import java.util.concurrent.CopyOnWriteArraySet; + +@Component +@Slf4j +@Service +@ServerEndpoint("/api/websocket/{sid}") +public class WebSocketServer { + private static int onlineCount = 0; + private static CopyOnWriteArraySet webSocketSet = new CopyOnWriteArraySet(); + private Session session; + private String sid = ""; + + /** + * 连接建立成功调用的方法 + */ + @OnOpen + public void onOpen(Session session, @PathParam("sid") String sid) { + this.session = session; + webSocketSet.add(this); //加入set中 + this.sid = sid; + addOnlineCount(); //在线数加1 + try { + sendMessage(new WebSocketEntity("sys", "连接成功")); + log.info("有新窗口开始监听:" + sid + ",当前在线人数为:" + getOnlineCount()); + } catch (IOException e) { + log.error("websocket IO Exception"); + } + } + + /** + * 连接关闭调用的方法 + */ + @OnClose + public void onClose() { + webSocketSet.remove(this); //从set中删除 + subOnlineCount(); //在线数减1 + //断开连接情况下，更新主板占用情况为释放 + log.info("释放的sid为：" + sid); + //这里写你 释放的时候，要处理的业务 + log.info("有一连接关闭！当前在线人数为" + getOnlineCount()); + + } + + /** + * 收到客户端消息后调用的方法 + * + * @ Param message 客户端发送过来的消息 + */ + @OnMessage + public void onMessage(String message, Session session) { + log.info("收到来自窗口" + sid + "的信息:" + message); + //群发消息 + for (WebSocketServer item : webSocketSet) { + try { + item.sendMessage(new WebSocketEntity("back", message)); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + + /** + * @ Param session + * @ Param error + */ + @OnError + public void onError(Session session, Throwable error) { + log.error("发生错误"); + error.printStackTrace(); + } + + /** + * 实现服务器主动推送 + */ + public void sendMessage(WebSocketEntity webSocketEntity) throws IOException { + String message = JSON.toJSON(webSocketEntity).toString(); + this.session.getBasicRemote().sendText(message); + } + + public static void sendInfo(String message, String type) { + log.info("推送消息到窗口" + type + "，推送内容:" + message); + + for (WebSocketServer item : webSocketSet) { + try { + if (type == null) { + item.sendMessage(new WebSocketEntity("sid", message)); + } else { + item.sendMessage(new WebSocketEntity(type, message)); + } + } catch (IOException e) { + continue; + } + } + } + + + public static synchronized int getOnlineCount() { + return onlineCount; + } + + public static synchronized void addOnlineCount() { + WebSocketServer.onlineCount++; + } + + public static synchronized void subOnlineCount() { + WebSocketServer.onlineCount--; + } + + public static CopyOnWriteArraySet getWebSocketSet() { + return webSocketSet; + } +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java new file mode 100644 index 00000000..4848b251 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java @@ -0,0 +1,62 @@ +package com.glxp.api.admin.controller.basic; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; +import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.service.basic.BasicThirdSysService; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.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 BasicThirdSysController { + + + @Resource + private BasicThirdSysService basicThirdSysService; + + + @GetMapping("/udiwms/basic/thirdsys/filter") + public BaseResponse filterBasicUnitMaintain(FilterBasicThirdSysRequest filterBasicThirdSysRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List basicThirdSysEntities; + basicThirdSysEntities = basicThirdSysService.filterBasicThiSys(filterBasicThirdSysRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(basicThirdSysEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(basicThirdSysEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("/udiwms/basic/thirdsys/update") + public BaseResponse save(@RequestBody @Valid BasicThirdSysEntity basicThirdSysEntity, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (basicThirdSysEntity != null) { + basicThirdSysService.updateBasicThiSys(basicThirdSysEntity); + } else { + ResultVOUtils.error(999, "参数错误"); + } + return ResultVOUtils.success("更新成功"); + } + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java index 806540e6..a3c7ab83 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java @@ -1,6 +1,8 @@ package com.glxp.api.admin.controller.basic; import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; +import com.glxp.api.admin.req.basic.CombineSingleUnitRequest; import com.glxp.api.admin.res.basic.ErpUnitsResponse; import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; @@ -13,6 +15,7 @@ import com.glxp.api.admin.req.receipt.CombineUnitRequest; import com.glxp.api.admin.req.receipt.UnitMaintainFilterRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.BasicUnitMaintainResponse; +import com.glxp.api.admin.service.basic.BasicThirdSysService; import com.glxp.api.admin.service.basic.BasicUnitMaintainService; import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.common.enums.ResultEnum; @@ -42,7 +45,8 @@ public class BasicUnitMaintainController { @Resource private BasicUnitMaintainService basicUnitMaintainService; - + @Resource + private BasicThirdSysService basicThirdSysService; @Autowired private SystemParamConfigService systemParamConfigService; @@ -62,7 +66,7 @@ public class BasicUnitMaintainController { pageSimpleResponse.setList(basicUnitMaintainEntities); SystemParamConfigEntity systemParamConfigEntityBUMErpId = systemParamConfigService.selectByParamKey("basic_unit_maintain_erp_id"); - SystemParamConfigEntity systemParamConfigEntityBUMThirdId = systemParamConfigService.selectByParamKey("basic_unit_maintain_third_id"); + SystemParamConfigEntity systemParamConfigEntityBUMThirdId = systemParamConfigService.selectByParamKey("basic_cops_thirdSys"); Map rMap = new HashMap<>(); rMap.put("BUMErpIdValue", systemParamConfigEntityBUMErpId != null && StringUtils.isNotBlank(systemParamConfigEntityBUMErpId.getParamValue()) ? @@ -75,7 +79,7 @@ public class BasicUnitMaintainController { } @PostMapping("/udiwms/basic/unit/maintain/save") - public BaseResponse save(@RequestBody @Valid BasicUnitMaintainSaveRequest basicUnitMaintainSaveRequest, + public BaseResponse save(@RequestBody @Valid BasicUnitMaintainEntity basicUnitMaintainSaveRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -85,7 +89,7 @@ public class BasicUnitMaintainController { BasicUnitMaintainEntity basicUnitMaintainEntity = new BasicUnitMaintainEntity(); BeanUtils.copyProperties(basicUnitMaintainSaveRequest, basicUnitMaintainEntity); - boolean b = basicUnitMaintainService.insert(basicUnitMaintainEntity); + boolean b = basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity); if (!b) { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); } @@ -94,7 +98,7 @@ public class BasicUnitMaintainController { } @PostMapping("/udiwms/basic/unit/maintain/update") - public BaseResponse update(@RequestBody BasicUnitMaintainSaveRequest basicUnitMaintainSaveRequest) { + public BaseResponse update(@RequestBody BasicUnitMaintainEntity basicUnitMaintainSaveRequest) { basicUnitMaintainService.updateById(basicUnitMaintainSaveRequest); return ResultVOUtils.success("修改成功"); } @@ -130,24 +134,66 @@ public class BasicUnitMaintainController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - List custmandocResponses = combineRequest.getCustmandocResponses(); - if (custmandocResponses != null && custmandocResponses.size() > 0) { - for (ErpUnitsResponse custmandocResponse : custmandocResponses) { + List erpUnitsResponses = combineRequest.getCustmandocResponses(); + if (erpUnitsResponses != null && erpUnitsResponses.size() > 0) { + for (ErpUnitsResponse erpUnitsResponse : erpUnitsResponses) { BasicUnitMaintainEntity basicUnitMaintainEntity = new BasicUnitMaintainEntity(); - basicUnitMaintainEntity.setErpId(custmandocResponse.getId()); - basicUnitMaintainEntity.setName(custmandocResponse.getName()); - basicUnitMaintainEntity.setSpell(custmandocResponse.getSpell()); - basicUnitMaintainEntity.setAddr(custmandocResponse.getAddr()); - basicUnitMaintainEntity.setCreditNo(custmandocResponse.getCreditNo()); - basicUnitMaintainEntity.setContact(custmandocResponse.getContact()); - basicUnitMaintainEntity.setMobile(custmandocResponse.getMobile()); + if (combineRequest.getThirdSys() != null) { + if ("thirdId".equals(combineRequest.getThirdSys())) { + basicUnitMaintainEntity.setThirdId(erpUnitsResponse.getId()); + } else if ("thirdId1".equals(combineRequest.getThirdSys())) { + basicUnitMaintainEntity.setThirdId1(erpUnitsResponse.getId()); + } else if ("thirdId2".equals(combineRequest.getThirdSys())) { + basicUnitMaintainEntity.setThirdId2(erpUnitsResponse.getId()); + } else if ("thirdId3".equals(combineRequest.getThirdSys())) { + basicUnitMaintainEntity.setThirdId3(erpUnitsResponse.getId()); + } else if ("thirdId4".equals(combineRequest.getThirdSys())) { + basicUnitMaintainEntity.setThirdId4(erpUnitsResponse.getId()); + } + } +// basicUnitMaintainEntity.setErpId(erpUnitsResponse.getId()); + basicUnitMaintainEntity.setName(erpUnitsResponse.getName()); + basicUnitMaintainEntity.setSpell(erpUnitsResponse.getSpell()); + basicUnitMaintainEntity.setAddr(erpUnitsResponse.getAddr()); + basicUnitMaintainEntity.setCreditNo(erpUnitsResponse.getCreditNo()); + basicUnitMaintainEntity.setContact(erpUnitsResponse.getContact()); + basicUnitMaintainEntity.setMobile(erpUnitsResponse.getMobile()); basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity); } } - return ResultVOUtils.success("选入成功"); } + @PostMapping("/udiwms/basic/unit/maintain/combineSingle") + public BaseResponse combineSingle(@RequestBody CombineSingleUnitRequest combineRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + ErpUnitsResponse erpUnitsResponse = combineRequest.getErpUnitsResponse(); + BasicUnitMaintainEntity basicUnitMaintainEntity = new BasicUnitMaintainEntity(); + if (combineRequest.getThirdSys() != null) { + if ("thirdId".equals(combineRequest.getThirdSys())) { + basicUnitMaintainEntity.setThirdId(combineRequest.getKey()); + } else if ("thirdId1".equals(combineRequest.getThirdSys())) { + basicUnitMaintainEntity.setThirdId1(combineRequest.getKey()); + } else if ("thirdId2".equals(combineRequest.getThirdSys())) { + basicUnitMaintainEntity.setThirdId2(combineRequest.getKey()); + } else if ("thirdId3".equals(combineRequest.getThirdSys())) { + basicUnitMaintainEntity.setThirdId3(combineRequest.getKey()); + } else if ("thirdId4".equals(combineRequest.getThirdSys())) { + basicUnitMaintainEntity.setThirdId4(combineRequest.getKey()); + } + } + basicUnitMaintainEntity.setName(erpUnitsResponse.getName()); + basicUnitMaintainEntity.setSpell(erpUnitsResponse.getSpell()); + basicUnitMaintainEntity.setAddr(erpUnitsResponse.getAddr()); + basicUnitMaintainEntity.setCreditNo(erpUnitsResponse.getCreditNo()); + basicUnitMaintainEntity.setContact(erpUnitsResponse.getContact()); + basicUnitMaintainEntity.setMobile(erpUnitsResponse.getMobile()); + basicUnitMaintainService.updateById(basicUnitMaintainEntity); + return ResultVOUtils.success("关联成功"); + } @PostMapping("/udiwms/basic/unit/maintain/delete") public BaseResponse deleteBasicUnitMaintain(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -171,11 +217,11 @@ public class BasicUnitMaintainController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - SystemParamConfigEntity systemParamConfigEntityBUMErpQuery = systemParamConfigService.selectByParamKey("basic_unit_maintain_erp_query"); - if (systemParamConfigEntityBUMErpQuery == null) + BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(unitMaintainFilterRequest.getThirdSys()); + if (basicThirdSysEntity == null || basicThirdSysEntity.getCorpUrl() == null) return ResultVOUtils.error(500, "往来单位接口地址未定义"); BaseResponse> udiDlDeviceResponse = - new ErpBasicClient().getErpCrop(unitMaintainFilterRequest, systemParamConfigEntityBUMErpQuery.getParamValue()); + new ErpBasicClient().getErpCrop(unitMaintainFilterRequest, basicThirdSysEntity.getCorpUrl()); return udiDlDeviceResponse; } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessTypeController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessTypeController.java index a23337c5..69ef53e5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessTypeController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessTypeController.java @@ -6,6 +6,7 @@ import com.glxp.api.admin.entity.basic.BussinessTypeEntity; import com.glxp.api.admin.req.inout.DeleteRequest; import com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest; import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.basic.BussinessTypResponse; import com.glxp.api.admin.service.basic.BussinessTypeService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; @@ -49,6 +50,24 @@ public class BussinessTypeController { return ResultVOUtils.success(pageSimpleResponse); } + @GetMapping("/udiwms/bussinessType/joinFilter") + public BaseResponse filterJoinBussinessType(BussinessTypeFilterRequest bussinessTypeFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List bussinessTypeEntities; + bussinessTypeEntities = bussinessTypeService.filterJoinList(bussinessTypeFilterRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(bussinessTypeEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(bussinessTypeEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("/udiwms/bussinessType/delete") public BaseResponse deleteBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java index 7b853507..ed2c4350 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java @@ -1,6 +1,7 @@ package com.glxp.api.admin.controller.basic; import com.alibaba.fastjson.JSONObject; +import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; import com.glxp.api.admin.entity.basic.UdiInfoEntity; import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; @@ -11,6 +12,7 @@ import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; import com.glxp.api.admin.req.info.SystemParamConfigRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.ErpProductsResponse; +import com.glxp.api.admin.service.basic.BasicThirdSysService; import com.glxp.api.admin.service.basic.UdiInfoService; import com.glxp.api.admin.service.basic.UdiRelevanceService; import com.glxp.api.admin.service.info.SystemParamConfigService; @@ -38,8 +40,9 @@ public class UdiInfoController { UdiRelevanceService udiRelevanceService; @Resource UdiInfoService udiInfoService; - @Autowired - private SystemParamConfigService systemParamConfigService; + + @Resource + private BasicThirdSysService basicThirdSysService; @Value("${UDI_SERVER_URL}") private String udiUrl; @@ -93,20 +96,21 @@ public class UdiInfoController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_products_query"); - if (systemParamConfigEntity == null) return ResultVOUtils.error(500, "ERP产品信息接口地址未定义"); + BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(filterErpGoodsRequest.getThirdSys()); + if (basicThirdSysEntity == null || basicThirdSysEntity.getPiQueryUrl() == null) + return ResultVOUtils.error(500, "ERP产品信息接口地址未定义"); ErpBasicClient erpBasicHttpClient = new ErpBasicClient(); - BaseResponse> udiDlDeviceResponse = erpBasicHttpClient.getErpProducts(filterErpGoodsRequest, systemParamConfigEntity.getParamValue()); + BaseResponse> udiDlDeviceResponse = erpBasicHttpClient.getErpProducts(filterErpGoodsRequest, basicThirdSysEntity.getPiQueryUrl()); if (udiDlDeviceResponse.getCode() == 20000) { List invmandocResponses = udiDlDeviceResponse.getData().getList(); for (ErpProductsResponse invmandocResponse : invmandocResponses) { UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(invmandocResponse.getCode()); + invmandocResponse.setThirdSys(filterErpGoodsRequest.getThirdSys()); if (udiRelevanceEntity != null) { invmandocResponse.setChecked(true); } else { invmandocResponse.setChecked(false); } - } } return udiDlDeviceResponse; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java index 06c10ec0..adfbb0b9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java @@ -3,23 +3,26 @@ package com.glxp.api.admin.controller.basic; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.config.WebSocketServer; +import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; import com.glxp.api.admin.entity.basic.UdiInfoEntity; import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; import com.glxp.api.admin.entity.inout.WarehouseEntity; import com.glxp.api.admin.httpclient.UdiDlHttpClient; -import com.glxp.api.admin.req.basic.CombineRequest; -import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; -import com.glxp.api.admin.req.basic.PostSmpUdiInfoRequest; +import com.glxp.api.admin.req.basic.*; import com.glxp.api.admin.req.inout.DeleteRequest; import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.basic.BasicProductThirdSysResponse; import com.glxp.api.admin.res.basic.UdiRelevanceResponse; import com.glxp.api.admin.res.inout.WarehouseResponse; +import com.glxp.api.admin.service.basic.BasicThirdSysService; import com.glxp.api.admin.service.basic.UdiInfoService; import com.glxp.api.admin.service.basic.UdiRelevanceService; import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.service.inout.CodesService; import com.glxp.api.admin.thread.BasicUpdateproductService; +import com.glxp.api.admin.util.CustomUtil; import com.glxp.api.admin.util.DateUtil; import com.glxp.api.admin.util.HttpClient; import com.glxp.api.common.enums.ResultEnum; @@ -53,6 +56,8 @@ public class UdiRelevanceController { CodesService warehouseService; @Resource private SystemParamConfigService systemParamConfigService; + @Resource + private BasicThirdSysService basicThirdSysService; //客户端器械信息下载 @GetMapping("/udi/udirel/download") @@ -103,22 +108,22 @@ public class UdiRelevanceController { //更新下载ERP存货产品 @GetMapping("/udi/udirel/updateErp") public BaseResponse updateErp() { - SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_products_query"); - String productUrl; - String onHandUrl; - if (systemParamConfigEntity == null) + SystemParamConfigEntity thirdSys = systemParamConfigService.selectByParamKey("erp_updateErpData_thirdSys"); + BasicThirdSysEntity basicThirdSysEntity; + if (thirdSys != null && thirdSys.getParamValue() != null) { + basicThirdSysEntity = basicThirdSysService.selectByThirdId(thirdSys.getParamValue()); + } else + basicThirdSysEntity = basicThirdSysService.selectByThirdId("thirdId"); + + if (basicThirdSysEntity == null || basicThirdSysEntity.getPiQueryUrl() == null) return ResultVOUtils.error(500, "ERP产品信息接口地址未定义"); - else - productUrl = systemParamConfigEntity.getParamValue(); - systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_onhand_query"); - if (systemParamConfigEntity == null) - return ResultVOUtils.error(500, "ERP现存量接口地址未定义"); - else - onHandUrl = systemParamConfigEntity.getParamValue(); - updateproductService.updateProduct(productUrl, onHandUrl); + if (basicThirdSysEntity == null || basicThirdSysEntity.getInvPiUrl() == null) + return ResultVOUtils.error(500, "ERP库存产品信息接口地址未定义"); + updateproductService.updateProduct(basicThirdSysEntity.getOrderQueryUrl(), basicThirdSysEntity.getInvPiUrl()); return ResultVOUtils.success("后台已开启下载更新，请稍后刷新查看！"); } + //多选删除 @PostMapping("/udi/udirel/deleteAll") public BaseResponse deleteAll(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -196,8 +201,7 @@ public class UdiRelevanceController { udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); } else { - udiRelevanceEntity.setThirdId(combineRequest.getThirdId()); - udiRelevanceEntity.setThirdName(combineRequest.getErpName()); + udiRelevanceEntity = setThird(combineRequest, udiRelevanceEntity); udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); udiRelevanceEntity.setUuid(key); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); @@ -225,9 +229,10 @@ public class UdiRelevanceController { //单独选入ERP产品 @PostMapping("/udi/udirel/addErp") public BaseResponse addErp(@RequestBody CombineRequest combineRequest) { - SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_products_query"); - if (systemParamConfigEntity == null) return ResultVOUtils.error(500, "ERP产品信息接口地址未定义"); - String url = systemParamConfigEntity.getParamValue(); + BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(combineRequest.getThirdSys()); + if (basicThirdSysEntity == null || basicThirdSysEntity.getPiQueryUrl() == null) + return ResultVOUtils.error(500, "ERP产品信息接口地址未定义"); + String url = basicThirdSysEntity.getPiQueryUrl(); updateproductService.addProduct(combineRequest.getThirdId(), combineRequest.getErpName(), url); return ResultVOUtils.success("添加成功"); } @@ -244,7 +249,6 @@ public class UdiRelevanceController { List ids = combineRequest.getKeys(); if (ids != null && ids.size() > 0) { List udiRelevanceResponses = new ArrayList<>(); - List postSmpUdiInfoRequests = new ArrayList<>(); for (int i = 0; i < ids.size(); i++) { FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); filterUdiInfoRequest.setId(ids.get(i)); @@ -270,13 +274,151 @@ public class UdiRelevanceController { } else { return ResultVOUtils.error(baseResponse.getCode(), baseResponse.getMessage()); } - }else { - return ResultVOUtils.error(500,"未选择产品信息"); + } else { + return ResultVOUtils.error(500, "未选择产品信息"); } + } + + //接收供应商或第三方服务上传产品信息 + @PostMapping("/udiwms/udirl/thirdSys/upload") + public BaseResponse uploadThirdServcie(@RequestBody PostThirdSysPiRequest postThirdSysPiRequest) { + List postSmpUdiInfoRequests = postThirdSysPiRequest.getDatas(); + if (postSmpUdiInfoRequests != null && postSmpUdiInfoRequests.size() > 0) { + for (PostSmpUdiInfoRequest postSmpUdiInfoRequest : postSmpUdiInfoRequests) { + UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); + if ("thirdId1".equals(postThirdSysPiRequest.getThirdSys())) { + udiRelevanceEntity.setThirdId1(postSmpUdiInfoRequest.getErpId()); + udiRelevanceEntity.setThirdName1(postSmpUdiInfoRequest.getErpName()); + } else if ("thirdId2".equals(postThirdSysPiRequest.getThirdSys())) { + udiRelevanceEntity.setThirdId2(postSmpUdiInfoRequest.getErpId()); + udiRelevanceEntity.setThirdName2(postSmpUdiInfoRequest.getErpName()); + } else if ("thirdId3".equals(postThirdSysPiRequest.getThirdSys())) { + udiRelevanceEntity.setThirdId3(postSmpUdiInfoRequest.getErpId()); + udiRelevanceEntity.setThirdName3(postSmpUdiInfoRequest.getErpName()); + }else if ("thirdId4".equals(postThirdSysPiRequest.getThirdSys())) { + udiRelevanceEntity.setThirdId4(postSmpUdiInfoRequest.getErpId()); + udiRelevanceEntity.setThirdName4(postSmpUdiInfoRequest.getErpName()); + }else { + udiRelevanceEntity.setThirdId(postSmpUdiInfoRequest.getErpId()); + udiRelevanceEntity.setThirdName(postSmpUdiInfoRequest.getErpName()); + } + if(postSmpUdiInfoRequest.getUuid() == null){ + udiRelevanceEntity.setUuid(CustomUtil.getUUId()); + }else { + udiRelevanceEntity.setUuid(postSmpUdiInfoRequest.getUuid()); + } + udiRelevanceEntity.setYbbm(postSmpUdiInfoRequest.getYbbm()); + udiRelevanceEntity.setSptm(postSmpUdiInfoRequest.getSptm()); + udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); + UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); + BeanUtils.copyProperties(postSmpUdiInfoRequest,udiInfoEntity); + udiInfoEntity.setUuid(udiRelevanceEntity.getUuid()); + udiInfoService.insertUdiInfo(udiInfoEntity); + udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); + } + } + WebSocketServer.sendInfo("产品信息上传解析完成，请刷新查看！","sid"); + return ResultVOUtils.success("产品信息上传成功！"); } + //获取产品信息详情（多平台） + @GetMapping("/udiwms/udirel/thirdSys/detail") + public BaseResponse getThirdSysDetail(FilterUdiInfoRequest filterUdiInfoRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(filterUdiInfoRequest.getId()); + FilterBasicThirdSysRequest filterBasicThirdSysRequest = new FilterBasicThirdSysRequest(); + filterBasicThirdSysRequest.setEnabled(true); + List basicThirdSysEntities = basicThirdSysService.filterBasicThiSys(filterBasicThirdSysRequest); + List basicProductThirdSysResponses = new ArrayList<>(); + if (udiRelevanceEntity.getThirdId() != null) { + BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse(); + BasicThirdSysEntity basicThirdSysEntity = filterThirdSys("thirdId", basicThirdSysEntities); + if (basicThirdSysEntity != null) + basicProductThirdSysResponse.setSysName(basicThirdSysEntity.getThirdName()); + basicProductThirdSysResponse.setThirdId(udiRelevanceEntity.getThirdId()); + basicProductThirdSysResponse.setThirdName(udiRelevanceEntity.getThirdName()); + basicProductThirdSysResponses.add(basicProductThirdSysResponse); + } + if (udiRelevanceEntity.getThirdId1() != null) { + BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse(); + BasicThirdSysEntity basicThirdSysEntity = filterThirdSys("thirdId1", basicThirdSysEntities); + if (basicThirdSysEntity != null) + basicProductThirdSysResponse.setSysName(basicThirdSysEntity.getThirdName()); + basicProductThirdSysResponse.setThirdId(udiRelevanceEntity.getThirdId()); + basicProductThirdSysResponse.setThirdName(udiRelevanceEntity.getThirdName()); + basicProductThirdSysResponses.add(basicProductThirdSysResponse); + } + if (udiRelevanceEntity.getThirdId2() != null) { + BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse(); + BasicThirdSysEntity basicThirdSysEntity = filterThirdSys("thirdId2", basicThirdSysEntities); + if (basicThirdSysEntity != null) + basicProductThirdSysResponse.setSysName(basicThirdSysEntity.getThirdName()); + basicProductThirdSysResponse.setThirdId(udiRelevanceEntity.getThirdId()); + basicProductThirdSysResponse.setThirdName(udiRelevanceEntity.getThirdName()); + basicProductThirdSysResponses.add(basicProductThirdSysResponse); + } + if (udiRelevanceEntity.getThirdId3() != null) { + BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse(); + BasicThirdSysEntity basicThirdSysEntity = filterThirdSys("thirdId3", basicThirdSysEntities); + if (basicThirdSysEntity != null) + basicProductThirdSysResponse.setSysName(basicThirdSysEntity.getThirdName()); + basicProductThirdSysResponse.setThirdId(udiRelevanceEntity.getThirdId()); + basicProductThirdSysResponse.setThirdName(udiRelevanceEntity.getThirdName()); + basicProductThirdSysResponses.add(basicProductThirdSysResponse); + } + if (udiRelevanceEntity.getThirdId4() != null) { + BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse(); + BasicThirdSysEntity basicThirdSysEntity = filterThirdSys("thirdId4", basicThirdSysEntities); + if (basicThirdSysEntity != null) + basicProductThirdSysResponse.setSysName(basicThirdSysEntity.getThirdName()); + basicProductThirdSysResponse.setThirdId(udiRelevanceEntity.getThirdId()); + basicProductThirdSysResponse.setThirdName(udiRelevanceEntity.getThirdName()); + basicProductThirdSysResponses.add(basicProductThirdSysResponse); + } + + PageInfo pageInfo; + pageInfo = new PageInfo<>(basicProductThirdSysResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(basicProductThirdSysResponses); + return ResultVOUtils.success(pageSimpleResponse); + } + + public UdiRelevanceEntity setThird(CombineRequest combineRequest, UdiRelevanceEntity udiRelevanceEntity) { + if ("thirdId".equals(combineRequest.getThirdSys())) { + udiRelevanceEntity.setThirdId(combineRequest.getThirdId()); + udiRelevanceEntity.setThirdName(combineRequest.getErpName()); + } else if ("thirdId1".equals(combineRequest.getThirdSys())) { + udiRelevanceEntity.setThirdId1(combineRequest.getThirdId()); + udiRelevanceEntity.setThirdName1(combineRequest.getErpName()); + } else if ("thirdId2".equals(combineRequest.getThirdSys())) { + udiRelevanceEntity.setThirdId2(combineRequest.getThirdId()); + udiRelevanceEntity.setThirdName2(combineRequest.getErpName()); + } else if ("thirdId3".equals(combineRequest.getThirdSys())) { + udiRelevanceEntity.setThirdId3(combineRequest.getThirdId()); + udiRelevanceEntity.setThirdName3(combineRequest.getErpName()); + } else if ("thirdId4".equals(combineRequest.getThirdSys())) { + udiRelevanceEntity.setThirdId4(combineRequest.getThirdId()); + udiRelevanceEntity.setThirdName4(combineRequest.getErpName()); + } + return udiRelevanceEntity; + } + + public BasicThirdSysEntity filterThirdSys(String thirdId, List basicThirdSysEntities) { + if (basicThirdSysEntities != null && basicThirdSysEntities.size() > 0) { + for (BasicThirdSysEntity basicThirdSysEntity : basicThirdSysEntities) { + if (thirdId.equals(basicThirdSysEntity.getThirdId())) { + return basicThirdSysEntity; + } + } + } + return null; + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java index 9a4077c6..1196bd3d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java @@ -12,6 +12,8 @@ import com.glxp.api.admin.entity.inout.ErpOrderEntity; import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; import com.glxp.api.admin.req.inout.*; import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.basic.BussinessTypResponse; +import com.glxp.api.admin.service.basic.BussinessTypeService; import com.glxp.api.admin.service.basic.UdiInfoService; import com.glxp.api.admin.service.basic.UdiRelevanceService; import com.glxp.api.admin.service.info.SystemParamConfigService; @@ -33,6 +35,7 @@ import javax.validation.Valid; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.TreeSet; import java.util.stream.Collectors; @RestController @@ -50,6 +53,8 @@ public class OrderController { private UdiRelevanceService udiRelevanceService; @Resource private SystemParamConfigService systemParamConfigService; + @Resource + private BussinessTypeService bussinessTypeService; @GetMapping("udiwms/inout/order/status") @@ -161,92 +166,87 @@ public class OrderController { } List orderList = orderMergeRequest.getOrderList(); - SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("forbidSameErp"); - if (systemParamConfigEntity == null || systemParamConfigEntity.getParamValue().equals("0")) { - 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); - + List mergeList = new ArrayList<>(); + if (orderList != null && orderList.size() > 1) { + for (String orderId : orderList) { + FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest(); + filterErpOrderRequest.setOrderId(orderId); + OrderEntity orderEntity = orderService.findById(orderId); + if (orderEntity != null) { + mergeList.add(orderEntity); } - 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); + 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; } - mainOrderEntity.setErpFk(docidStr); - orderService.updateOrder(mainOrderEntity); - SystemParamConfigEntity erpEntity = systemParamConfigService.selectByParamKey("erp_order_query"); - if (erpEntity == null) { + docidStr = docidStr.substring(1); + } + mainOrderEntity.setErpFk(docidStr); + orderService.updateOrder(mainOrderEntity); + if (docidStr.length() > 0) { + BussinessTypResponse bussinessTypResponse = bussinessTypeService.findJoinBTByAction(mainOrderEntity.getAction()); + if (bussinessTypResponse.getOrderQueryUrl() == null) { return ResultVOUtils.error(500, "ERP出入库单据查询接口地址未定义"); } - List erpOrderEntities = new ErpOrderClient(erpEntity.getParamValue()).getErpOrder(docids, mainOrderEntity.getAction()); + List erpOrderEntities = new ErpOrderClient(bussinessTypResponse.getOrderQueryUrl()).getErpOrder(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, systemParamConfigService); } else { - orderService.updateContrastStatus(mainOrder, "error"); - orderService.updateRemark(mainOrder, "U8Cloud获取ERP单失败"); - return ResultVOUtils.error(500, "U8Cloud获取ERP单失败"); + mainOrderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL); + mainOrderEntity.setRemark("获取ERP单失败"); + orderService.updateOrder(mainOrderEntity); + List datas = warehouseService.findByReceiptId(mainOrder); + new InoutUtils().generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, datas); + return ResultVOUtils.error(500, "获取ERP单失败"); } } else { - return ResultVOUtils.error(ResultEnum.DATA_ERROR); - } - } else { - 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.getErpOrderId() != 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(); } + + } else { + return ResultVOUtils.error(ResultEnum.DATA_ERROR); } + return ResultVOUtils.success("合并成功,后台正在数据转换，请稍后刷新重试！"); } - public List getDocids(List mergeList) { + public List getDocids(List mergeList) { List docids = new ArrayList<>(); - Map> mapErps = mergeList.stream().collect(Collectors.groupingBy(ErpOrderEntity::getErpOrderId)); - for (String key : mapErps.keySet()) { - docids.add(key); + for (int i = 0; i < mergeList.size(); i++) { + OrderEntity orderEntity = mergeList.get(i); + if (orderEntity.getErpFk() != null && !"".equals(orderEntity.getErpFk())) { + String[] erpFks = orderEntity.getErpFk().split(","); + if (erpFks.length > 0) { + for (int j = 0; j < erpFks.length; j++) { + docids.add(erpFks[j]); + } + } + } } - return docids; + if (docids.size() > 1) { + return new ArrayList<>(new TreeSet<>(docids)); + } else + return docids; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java index 0ea4c773..6e6d9948 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java @@ -7,11 +7,13 @@ import com.glxp.api.admin.entity.info.SystemParamConfigEntity; import com.glxp.api.admin.entity.inout.ErpOrderEntity; import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; import com.glxp.api.admin.httpclient.ErpOrderClient; +import com.glxp.api.admin.res.basic.BussinessTypResponse; import com.glxp.api.admin.res.inout.PurchaseinResponse; import com.glxp.api.admin.entity.inout.OrderEntity; import com.glxp.api.admin.entity.inout.WarehouseEntity; import com.glxp.api.admin.req.inout.*; import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.service.basic.BussinessTypeService; import com.glxp.api.admin.service.basic.UdiInfoService; import com.glxp.api.admin.service.basic.UdiRelevanceService; import com.glxp.api.admin.service.info.SystemParamConfigService; @@ -49,11 +51,12 @@ public class OrderDetailController { @Resource private UdiRelevanceService udiRelevanceService; - @Resource private IoTransInoutService transInoutService; @Autowired private SystemParamConfigService systemParamConfigService; + @Resource + private BussinessTypeService bussinessTypeService; @GetMapping("/udiwms/erpOrder/filter") public BaseResponse filterErpOrder(FilterOrderRequest filterErpOrderRequest, @@ -62,11 +65,11 @@ public class OrderDetailController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_order_query"); - if (systemParamConfigEntity == null) { + BussinessTypResponse bussinessTypResponse = bussinessTypeService.findJoinBTByAction(filterErpOrderRequest.getBillAction()); + if (bussinessTypResponse==null || bussinessTypResponse.getOrderQueryUrl() == null) { return ResultVOUtils.error(500, "ERP出入库单据接口未定义"); } - return new ErpOrderClient(systemParamConfigEntity.getParamValue()).getErpOrderResponse(filterErpOrderRequest); + return new ErpOrderClient(bussinessTypResponse.getOrderQueryUrl()).getErpOrderResponse(filterErpOrderRequest); // } @@ -152,10 +155,10 @@ public class OrderDetailController { } } } - SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_order_modify"); - if (systemParamConfigEntity == null) + BussinessTypResponse bussinessTypResponse = bussinessTypeService.findJoinBTByAction(orderEntity.getAction()); + if (bussinessTypResponse.getOrderModifyUrl() == null) return ResultVOUtils.error(500, "ERP出入库单据修改接口未定义"); - String url = systemParamConfigEntity.getParamValue(); + String url = bussinessTypResponse.getOrderModifyUrl(); Map> listMap = erpOrderEntities.stream().collect(Collectors.groupingBy(ErpOrderEntity::getErpOrderId)); BaseResponse baseResponse = new ErpOrderClient().postBill(listMap, orderEntity.getAction(), url); if (baseResponse != null && baseResponse.getCode() == 20000) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java index 3fcb73cd..1aa59921 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java @@ -133,6 +133,7 @@ public class WareHouseController { } transInoutService.repeatCommit(commitRequest); return ResultVOUtils.success("提交成功，后台已开启重码校验，请稍后刷新查看！"); + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvErpOnhandController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvErpOnhandController.java index be286e19..256f89a8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvErpOnhandController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvErpOnhandController.java @@ -2,6 +2,7 @@ package com.glxp.api.admin.controller.inventory; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; +import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; import com.glxp.api.admin.entity.basic.UdiEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; @@ -12,7 +13,9 @@ import com.glxp.api.admin.req.inventory.ErpOnhandRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.UOnhandQueryResponse; import com.glxp.api.admin.res.basic.UdiRelevanceResponse; +import com.glxp.api.admin.res.inventory.ErpInvProductResponse; import com.glxp.api.admin.res.inventory.ErpOnHandResponse; +import com.glxp.api.admin.service.basic.BasicThirdSysService; import com.glxp.api.admin.service.basic.UdiRelevanceService; import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.util.FilterUdiUtils; @@ -37,6 +40,8 @@ public class InvErpOnhandController { UdiRelevanceService udiRelevanceService; @Resource private SystemParamConfigService systemParamConfigService; + @Resource + private BasicThirdSysService basicThirdSysService; @GetMapping("/udiwms/inv/getOnHand") @@ -63,17 +68,23 @@ public class InvErpOnhandController { return ResultVOUtils.error(500, "无效UDI码"); } - } else if (onhandQueryRequest.getNameCode() != null) { - UdiRelevanceResponse udiRelevanceResponse = findByNamecode(onhandQueryRequest.getNameCode()); - onhandQueryRequest.setInventoryCode(udiRelevanceResponse.getThirdId()); } - SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_onhand_query"); +// else if (onhandQueryRequest.getNameCode() != null) { +// UdiRelevanceResponse udiRelevanceResponse = findByNamecode(onhandQueryRequest.getNameCode()); +// onhandQueryRequest.setInventoryCode(udiRelevanceResponse.getThirdId()); +// } + BasicThirdSysEntity basicThirdSysEntity = null; + if(onhandQueryRequest.getThirdSys() == null){ +// basicThirdSysEntity = basicThirdSysService.selectByThirdId("thirdId"); + }else { + basicThirdSysEntity = basicThirdSysService.selectByThirdId(onhandQueryRequest.getThirdSys()); + } String onHandUrl; - if (systemParamConfigEntity == null) + if (basicThirdSysEntity == null || basicThirdSysEntity.getInvPiUrl()==null) return ResultVOUtils.error(500, "ERP现存量接口地址未定义"); else - onHandUrl = systemParamConfigEntity.getParamValue(); - BaseResponse> responseBaseResponse = new ErpInvClient().getOnHandResponse(onhandQueryRequest, onHandUrl); + onHandUrl = basicThirdSysEntity.getInvPiUrl(); + BaseResponse> responseBaseResponse = new ErpInvClient().getInvPrdoductResponse(onhandQueryRequest, onHandUrl); return responseBaseResponse; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPrintController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPrintController.java index ceb933a2..abf84d0f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPrintController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPrintController.java @@ -1,6 +1,7 @@ package com.glxp.api.admin.controller.inventory; import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; import com.glxp.api.admin.httpclient.ErpInvClient; import com.glxp.api.admin.req.inventory.ErpOnhandRequest; @@ -9,7 +10,9 @@ import com.glxp.api.admin.req.basic.FilterStockprintRequest; import com.glxp.api.admin.req.basic.UpdatePrintStatusRequest; import com.glxp.api.admin.req.inout.DeleteRequest; import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.inventory.ErpInvProductResponse; import com.glxp.api.admin.res.inventory.ErpOnHandResponse; +import com.glxp.api.admin.service.basic.BasicThirdSysService; import com.glxp.api.admin.service.inventory.InvStockPrintService; import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.thread.InvImportStockService; @@ -30,6 +33,8 @@ public class InvPrintController { InvImportStockService importStockService; @Resource private SystemParamConfigService systemParamConfigService; + @Resource + private BasicThirdSysService basicThirdSysService; @PostMapping("/udiwarehouse/stockPrint/filter") public BaseResponse filterAll(@RequestBody FilterStockprintRequest stockprintRequest, @@ -74,21 +79,27 @@ public class InvPrintController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_onhand_query"); + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_phone_get_invpi"); String onHandUrl; + String thirdSys; if (systemParamConfigEntity == null) - return ResultVOUtils.error(500, "ERP产品信息接口地址未定义"); - else onHandUrl = systemParamConfigEntity.getParamValue(); - + return ResultVOUtils.error(500, "ERP库存产品信息接口地址未定义"); + else thirdSys = systemParamConfigEntity.getParamValue(); + BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(thirdSys); + if (basicThirdSysEntity == null || basicThirdSysEntity.getInvPiUrl() == null) { + return ResultVOUtils.error(500, "ERP库存产品信息接口地址未定义"); + } else { + onHandUrl = basicThirdSysEntity.getInvPiUrl(); + } List stockPrintEntities = stockPrintService.filterStockPrint(stockprintRequest); if (stockPrintEntities != null) { for (StockPrintEntity stockPrintEntity : stockPrintEntities) { ErpOnhandRequest erpOnhandRequest = new ErpOnhandRequest(); erpOnhandRequest.setInventoryCode(stockPrintEntity.getThirdId()); - List erpOnHandResponses = new ErpInvClient().getOnHand(erpOnhandRequest, onHandUrl); + List erpOnHandResponses = new ErpInvClient().getInvPrdoduct(erpOnhandRequest, onHandUrl); if (erpOnHandResponses != null && erpOnHandResponses.size() > 0) { - for (ErpOnHandResponse onhandQueryResponse : erpOnHandResponses) { + for (ErpInvProductResponse onhandQueryResponse : erpOnHandResponses) { if (onhandQueryResponse.getBatchNo().equals(stockPrintEntity.getBatchNo()) && onhandQueryResponse.getWarehouseCode().equals(stockPrintEntity.getWarehouseCode())) { stockPrintEntity.setNnum(onhandQueryResponse.getCount() + ""); break; @@ -162,7 +173,6 @@ public class InvPrintController { } - @GetMapping("/warehouse/stockPrint/dlErpStock") public BaseResponse dlErpStock() { // dlErpStockService.dlErpStock(); @@ -181,7 +191,7 @@ public class InvPrintController { return ResultVOUtils.error(500, "ERP库存产品信息查询接口地址未定义"); else url = systemParamConfigEntity.getParamValue(); - importStockService.updateByCode(stockprintRequest.getThirdId(),url); + importStockService.updateByCode(stockprintRequest.getThirdId(), url); return ResultVOUtils.success("后台已开始自动更新，请稍后刷新查看"); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpsController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpsController.java new file mode 100644 index 00000000..29ef8a8f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpsController.java @@ -0,0 +1,76 @@ +package com.glxp.api.admin.controller.thrsys; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.entity.inventory.StockPrintEntity; +import com.glxp.api.admin.entity.thrsys.ThrCorpEntity; +import com.glxp.api.admin.req.basic.FilterStockprintRequest; +import com.glxp.api.admin.req.thrsys.FilterThrCorpRequest; +import com.glxp.api.admin.req.thrsys.PostThrCorpRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.basic.ErpUnitsResponse; +import com.glxp.api.admin.res.inout.WarehouseResponse; +import com.glxp.api.admin.service.thrsys.ThrCorpService; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; + +@RestController +public class ThrCorpsController { + + @Resource + private ThrCorpService thrCorpService; + + @GetMapping("/udiwms/thrsys/getCorps") + public BaseResponse getCorps(FilterThrCorpRequest filterThrCorpRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List thrCorpEntities + = thrCorpService.filterThrCorps(filterThrCorpRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(thrCorpEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(thrCorpEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("/udiwms/thrsys/postCorps") + public BaseResponse postCorps(PostThrCorpRequest postThrCorpRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List thrCorpEntities; + List erpUnitsResponses = postThrCorpRequest.getCorps(); + if (erpUnitsResponses != null && erpUnitsResponses.size() > 0) { + + + thrCorpEntities = erpUnitsResponses.stream().map( + item -> { + ThrCorpEntity thrCorpEntity = new ThrCorpEntity(); + BeanUtils.copyProperties(item, thrCorpEntity); + thrCorpEntity.setThirdSysFk(postThrCorpRequest.getThirdSys()); + return thrCorpEntity; + } + ).collect(Collectors.toList()); + thrCorpService.insertThrCorpss(thrCorpEntities); + return ResultVOUtils.success("往来单位上传成功！"); + + } + + return ResultVOUtils.error(500, "上传数据为空"); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvProductsController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvProductsController.java new file mode 100644 index 00000000..051a8b77 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvProductsController.java @@ -0,0 +1,76 @@ +package com.glxp.api.admin.controller.thrsys; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity; +import com.glxp.api.admin.req.thrsys.FilterThrInvProductsRequest; +import com.glxp.api.admin.req.thrsys.PostThrCorpRequest; +import com.glxp.api.admin.req.thrsys.PostThrInvProductsRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.basic.ErpUnitsResponse; +import com.glxp.api.admin.res.inventory.ErpOnHandResponse; +import com.glxp.api.admin.service.thrsys.ThrInvProductsService; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; + +@RestController +public class ThrInvProductsController { + + + @Resource + private ThrInvProductsService thrInvProductsService; + + @GetMapping("/udiwms/thrsys/getInvProducts") + public BaseResponse getCorps(FilterThrInvProductsRequest filterThrInvProductsRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List thrInvProductsEntities + = thrInvProductsService.filterThrInvProductss(filterThrInvProductsRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(thrInvProductsEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(thrInvProductsEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("/udiwms/thrsys/postInvProducts") + public BaseResponse postInvProducts(PostThrInvProductsRequest postThrInvProductsRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List thrInvProductsEntities; + List erpOnHandResponses = postThrInvProductsRequest.getDatas(); + if (erpOnHandResponses != null && erpOnHandResponses.size() > 0) { + + thrInvProductsEntities = erpOnHandResponses.stream().map( + item -> { + ThrInvProductsEntity thrInvProductsEntity = new ThrInvProductsEntity(); + BeanUtils.copyProperties(item, thrInvProductsEntity); + thrInvProductsEntity.setThirdSysFk(postThrInvProductsRequest.getThirdSys()); + return thrInvProductsEntity; + } + ).collect(Collectors.toList()); + thrInvProductsService.insertThrInvProducts(thrInvProductsEntities); + return ResultVOUtils.success("往来单位上传成功！"); + + } + + return ResultVOUtils.error(500, "上传数据为空"); + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderController.java new file mode 100644 index 00000000..99c3bc02 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderController.java @@ -0,0 +1,111 @@ +package com.glxp.api.admin.controller.thrsys; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity; +import com.glxp.api.admin.entity.thrsys.ThrOrderEntity; +import com.glxp.api.admin.req.thrsys.FilterThrOrderDetailRequest; +import com.glxp.api.admin.req.thrsys.FilterThrOrderRequest; +import com.glxp.api.admin.req.thrsys.PostThrOrderRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.inout.ErpOrderResponse; +import com.glxp.api.admin.service.thrsys.ThrOrderDetailService; +import com.glxp.api.admin.service.thrsys.ThrOrderService; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; + +@RestController +public class ThrOrderController { + @Resource + private ThrOrderService thrOrderService; + @Resource + private ThrOrderDetailService thrOrderDetailService; + + @GetMapping("/udiwms/thrsys/getOrders") + public BaseResponse getOrders(FilterThrOrderRequest filterThrOrderRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List thrOrderEntities + = thrOrderService.filterThrOrder(filterThrOrderRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(thrOrderEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(thrOrderEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @GetMapping("/udiwms/thrsys/getOrderDetails") + public BaseResponse getOrderDetails(FilterThrOrderDetailRequest filterThrOrderDetailRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List thrOrderDetailEntities + = thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(thrOrderDetailEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(thrOrderDetailEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @PostMapping("/udiwms/thrsys/postOrderDetail") + public BaseResponse postOrderDetail(PostThrOrderRequest postThrOrderRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List thrOrderEntities; + List erpOrderResponses = postThrOrderRequest.getDatas(); + if (erpOrderResponses != null && erpOrderResponses.size() > 0) { + + thrOrderEntities = erpOrderResponses.stream().map( + item -> { + ThrOrderEntity thrOrderEntity = new ThrOrderEntity(); + BeanUtils.copyProperties(item, thrOrderEntity); + thrOrderEntity.setThirdSysFk(postThrOrderRequest.getThirdSys()); + thrOrderService.insertThrOrder(thrOrderEntity); + thrOrderEntity = thrOrderService.findByUnique(thrOrderEntity.getBillNo(), thrOrderEntity.getThirdSysFk()); + List subErpOrders = item.getSubErpOrders(); + if (subErpOrders != null && subErpOrders.size() > 0) { + List thrOrderDetailEntities; + ThrOrderEntity finalThrOrderEntity = thrOrderEntity; + thrOrderDetailEntities = subErpOrders.stream().map(subItem -> + { + ThrOrderDetailEntity thrOrderDetailEntity = new ThrOrderDetailEntity(); + BeanUtils.copyProperties(subItem, finalThrOrderEntity); + thrOrderDetailEntity.setOrderIdFk(finalThrOrderEntity.getId() + ""); + thrOrderDetailEntity.setThirdSysFk(finalThrOrderEntity.getThirdSysFk()); + return thrOrderDetailEntity; + }).collect(Collectors.toList()); + thrOrderDetailService.insertThrOrderDetails(thrOrderDetailEntities); + } + return thrOrderEntity; + } + ).collect(Collectors.toList()); + thrOrderService.insertThrOrders(thrOrderEntities); + return ResultVOUtils.success("单据上传成功！"); + } + + return ResultVOUtils.error(500, "上传数据为空"); + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsController.java new file mode 100644 index 00000000..0fd166d0 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsController.java @@ -0,0 +1,72 @@ +package com.glxp.api.admin.controller.thrsys; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; +import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; +import com.glxp.api.admin.req.thrsys.PostThrProductsRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.basic.ErpProductsResponse; +import com.glxp.api.admin.service.thrsys.ThrProductsService; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; + +@RestController +public class ThrProductsController { + + @Resource + private ThrProductsService thrProductsService; + + @GetMapping("/udiwms/thrsys/getThrProducts") + public BaseResponse getThrProducts(FilterThrProductsRequest filterThrProductsRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List thrCorpEntities + = thrProductsService.filterThrProductsRequest(filterThrProductsRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(thrCorpEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(thrCorpEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("/udiwms/thrsys/postThrProducts") + public BaseResponse postThrProducts(PostThrProductsRequest postThrProductsRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List thrProductsEntities; + List erpProductsResponses = postThrProductsRequest.getDatas(); + if (erpProductsResponses != null && erpProductsResponses.size() > 0) { + thrProductsEntities = erpProductsResponses.stream().map( + item -> { + ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); + BeanUtils.copyProperties(item, thrProductsEntity); + thrProductsEntity.setThirdSysFk(postThrProductsRequest.getThirdSys()); + return thrProductsEntity; + } + ).collect(Collectors.toList()); + thrProductsService.insertThrProductss(thrProductsEntities); + return ResultVOUtils.success("产品信息上传成功！"); + + } + + return ResultVOUtils.error(500, "上传数据为空"); + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicThirdSysDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicThirdSysDao.java new file mode 100644 index 00000000..b1cf5ed7 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicThirdSysDao.java @@ -0,0 +1,20 @@ +package com.glxp.api.admin.dao.basic; + +import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; +import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface BasicThirdSysDao { + + boolean updateBasicThiSys(BasicThirdSysEntity basicThirdSysEntity); + + BasicThirdSysEntity selectByThirdId(@Param("thirdId") String thirdId); + + List filterBasicThiSys(FilterBasicThirdSysRequest filterBasicThirdSysRequest); + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicUnitMaintainDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicUnitMaintainDao.java index aafc1bbb..3499b81f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicUnitMaintainDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicUnitMaintainDao.java @@ -14,9 +14,7 @@ public interface BasicUnitMaintainDao { boolean insertBasicUnitMaintain(BasicUnitMaintainEntity basicUnitMaintainEntity); - boolean insert(BasicUnitMaintainEntity basicUnitMaintainEntity); - - boolean updateById(BasicUnitMaintainSaveRequest basicUnitMaintainSaveRequest); + boolean updateById(BasicUnitMaintainEntity basicUnitMaintainSaveRequest); boolean deleteById(@Param("id") String id); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessTypeDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessTypeDao.java index ba50238f..0b86fa53 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessTypeDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessTypeDao.java @@ -2,6 +2,7 @@ package com.glxp.api.admin.dao.basic; import com.glxp.api.admin.entity.basic.BussinessTypeEntity; import com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest; +import com.glxp.api.admin.res.basic.BussinessTypResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -12,6 +13,8 @@ public interface BussinessTypeDao { List filterList(BussinessTypeFilterRequest bussinessTypeFilterRequest); + List filterJoinList(BussinessTypeFilterRequest bussinessTypeFilterRequest); + boolean insertBussinessType(BussinessTypeEntity bussinessTypeEntity); boolean updateBussinessType(BussinessTypeEntity bussinessTypeEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpDao.java new file mode 100644 index 00000000..bec0e8ce --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpDao.java @@ -0,0 +1,23 @@ +package com.glxp.api.admin.dao.thrsys; + +import com.glxp.api.admin.entity.thrsys.ThrCorpEntity; +import com.glxp.api.admin.req.thrsys.FilterThrCorpRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface ThrCorpDao { + + List filterThrCorps(FilterThrCorpRequest filterThrCorpRequest); + + boolean insertThrCorps(ThrCorpEntity thrCorpEntity); + + boolean insertThrCorpss(@Param("thrCorpEntitys") List thrCorpEntitys); + + boolean updateThrCorps(ThrCorpEntity thrCorpEntity); + + boolean deleteById(@Param("id") String id); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvProductsDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvProductsDao.java new file mode 100644 index 00000000..553f09c9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvProductsDao.java @@ -0,0 +1,23 @@ +package com.glxp.api.admin.dao.thrsys; + +import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity; +import com.glxp.api.admin.req.thrsys.FilterThrInvProductsRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface ThrInvProductsDao { + + List filterThrInvProductss(FilterThrInvProductsRequest filterThrInvProductsRequest); + + boolean insertThrInvProduct(ThrInvProductsEntity thrInvProductsEntity); + + boolean insertThrInvProducts(@Param("thrInvProductsEntities") List thrInvProductsEntities); + + boolean updateThrInvProducts(ThrInvProductsEntity thrInvProductsEntity); + + boolean deleteById(@Param("id") String id); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDao.java new file mode 100644 index 00000000..2c194a2f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDao.java @@ -0,0 +1,22 @@ +package com.glxp.api.admin.dao.thrsys; + +import com.glxp.api.admin.entity.thrsys.ThrOrderEntity; +import com.glxp.api.admin.req.thrsys.FilterThrOrderRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface ThrOrderDao { + + List filterThrOrder(FilterThrOrderRequest filterThrOrderRequest); + + boolean insertThrOrder(ThrOrderEntity thrCorpEntity); + + boolean insertThrOrders(@Param("thrOrderEntities") List thrOrderEntities); + + boolean updateThrOrder(ThrOrderEntity thrOrderEntity); + + boolean deleteById(@Param("id") String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDetailDao.java new file mode 100644 index 00000000..f4faa3d1 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDetailDao.java @@ -0,0 +1,23 @@ +package com.glxp.api.admin.dao.thrsys; + +import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity; +import com.glxp.api.admin.req.thrsys.FilterThrOrderDetailRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface ThrOrderDetailDao { + + List filterThrOrderDetailDetail(FilterThrOrderDetailRequest filterThrOrderDetailRequest); + + boolean insertThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity); + + boolean insertThrOrderDetails(@Param("thrOrderDetailEntities") List thrOrderDetailEntities); + + boolean updateThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity); + + boolean deleteById(@Param("id") String id); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsDao.java new file mode 100644 index 00000000..c4067fdb --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsDao.java @@ -0,0 +1,24 @@ +package com.glxp.api.admin.dao.thrsys; + +import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; +import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface ThrProductsDao { + + + List filterThrProductsRequest(FilterThrProductsRequest filterThrProductsRequest); + + boolean insertThrProducts(ThrProductsEntity thrProductsEntity); + + boolean insertThrProductss(@Param("thrProductsEntities") List thrProductsEntities); + + boolean updateThrProducts(ThrProductsEntity thrProductsEntity); + + boolean deleteById(@Param("id") String id); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysEntity.java new file mode 100644 index 00000000..f7d4a6d9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysEntity.java @@ -0,0 +1,27 @@ +package com.glxp.api.admin.entity.basic; + +import lombok.Data; + +@Data +public class BasicThirdSysEntity { + private String id; + private String thirdId; + private String thirdName; + private String piQueryUrl; + private Boolean piQueryEnabled; + private String orderQueryUrl; + private Boolean orderQueryEnabled; + private String orderAddUrl; + private Boolean orderAddEnabled; + private String orderDeleteUrl; + private Boolean orderDeleteEnabled; + private String orderModifyUrl; + private Boolean orderModifyEnabled; + private String invPiUrl; + private Boolean invPiEnabled; + private String corpUrl; + private Boolean corpEnabled; + private Boolean enabled; + private String remark; + private String thirdSysFk; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.java index 3d1066ae..2fb51b05 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.java @@ -6,7 +6,6 @@ import lombok.Data; public class BasicUnitMaintainEntity { private Integer id; - private String thirdId; private String erpId; private String name; private String spell; @@ -17,4 +16,10 @@ public class BasicUnitMaintainEntity { private String contact; private String mobile; + private String thirdId; + private String thirdId1; + private String thirdId2; + private String thirdId3; + private String thirdId4; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessTypeEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessTypeEntity.java index f7253eb0..98526285 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessTypeEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessTypeEntity.java @@ -10,5 +10,6 @@ public class BussinessTypeEntity { private Boolean enable; private String remark; private String mainAction; + private String thirdSysFk; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java index 3cd47fb6..836564d9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java @@ -11,5 +11,16 @@ public class UdiRelevanceEntity { private String uuid; private Boolean isUseDy; private String updateTime; + private String thirdId1; + private String thirdId2; + private String thirdId3; + private String thirdId4; + private String thirdName1; + private String thirdName2; + private String thirdName3; + private String thirdName4; + private String ybbm; + private String sptm; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/info/WebSocketEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/info/WebSocketEntity.java new file mode 100644 index 00000000..c85799c5 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/info/WebSocketEntity.java @@ -0,0 +1,14 @@ +package com.glxp.api.admin.entity.info; + +import lombok.Data; + +@Data +public class WebSocketEntity { + private String type; + private String data; + + public WebSocketEntity(String type, String data) { + this.type = type; + this.data = data; + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrCorpEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrCorpEntity.java new file mode 100644 index 00000000..22f3831c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrCorpEntity.java @@ -0,0 +1,19 @@ +package com.glxp.api.admin.entity.thrsys; + +import lombok.Data; + +@Data +public class ThrCorpEntity { + + private Integer id; + private String unitId; + private String name; + private String spell; + private String addr; + private String creditNo; + private String contact; + private String mobile; + private String thirdSysFk; + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvProductsEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvProductsEntity.java new file mode 100644 index 00000000..27306a14 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvProductsEntity.java @@ -0,0 +1,22 @@ +package com.glxp.api.admin.entity.thrsys; + +import lombok.Data; + +@Data +public class ThrInvProductsEntity { + + private Integer id; + private String inventoryCode; + private String inventoryName; + private String spec; + private String count; + private String batchNo; + private String warehouseName; + private String warehouseCode; + private String registerCertNo; + private String manufacturingDate; + private String expirationDate; + private String thirdSysFk; + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderDetailEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderDetailEntity.java new file mode 100644 index 00000000..b45537af --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderDetailEntity.java @@ -0,0 +1,19 @@ +package com.glxp.api.admin.entity.thrsys; + +import lombok.Data; + +@Data +public class ThrOrderDetailEntity { + private Integer id; + private String productId; + private String productName; + private String spec; + private String batchNo; + private String expireDate; + private String productDate; + private String count; + private String reCount; + private String orderIdFk; + private String thirdSysFk; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderEntity.java new file mode 100644 index 00000000..14b1a7b1 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderEntity.java @@ -0,0 +1,17 @@ +package com.glxp.api.admin.entity.thrsys; + +import lombok.Data; + +@Data +public class ThrOrderEntity { + + private Integer id; + private String billNo; + private String billdate; + private String corpId; + private String corpName; + private String billType; + private String billFlag; + private String thirdSysFk; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrProductsEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrProductsEntity.java new file mode 100644 index 00000000..7e087a6e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrProductsEntity.java @@ -0,0 +1,16 @@ +package com.glxp.api.admin.entity.thrsys; + +import lombok.Data; + +@Data +public class ThrProductsEntity { + private Integer id; + private String code; + private String name; + private String measname; + private String spec; + private String registerNo; + private String manufactory; + private String thirdSysFk; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java index 4b177e49..c1159224 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java +++ b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java @@ -23,8 +23,7 @@ public class ErpBasicClient { //获取往来单位 public BaseResponse> getErpCrop(UnitMaintainFilterRequest unitMaintainFilterRequest, String url) { Map paramMap = new HashMap<>(16); - paramMap.put("unitId", unitMaintainFilterRequest.getUnitId()); - paramMap.put("name", unitMaintainFilterRequest.getName()); + paramMap.put("key", unitMaintainFilterRequest.getKey()); paramMap.put("page", unitMaintainFilterRequest.getPage()); paramMap.put("limit", unitMaintainFilterRequest.getLimit()); String response = HttpClient.mipsGet(url, paramMap); diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpOrderClient.java b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpOrderClient.java index 3bfb9dcf..bbf89d2d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpOrderClient.java +++ b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpOrderClient.java @@ -117,9 +117,6 @@ public class ErpOrderClient { filterOrderRequest.setBillAction(action); filterOrderRequest.setBillNo(billCode); List erpOrderEntities = getErpOrder(filterOrderRequest); -// if (erpOrderEntities != null && erpOrderEntities.size() > 0) { -// return erpOrderEntities.get(0); -// } return erpOrderEntities; } @@ -134,6 +131,14 @@ public class ErpOrderClient { return baseResponse; } + public BaseResponse postBill(ERPPostBillRequest erpPostBillRequest, String uploadUrl) { + String response = HttpClient.uCloudPost(uploadUrl, erpPostBillRequest); + BaseResponse baseResponse = + JSONObject.parseObject(response, new TypeReference() { + }); + return baseResponse; + } + public BaseResponse signBill(USignRequest signRequest, String url) { String response = HttpClient.uCloudPost(url, signRequest); BaseResponse baseResponse = diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/CombineRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/CombineRequest.java index 5a6db6e8..366680c9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/CombineRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/CombineRequest.java @@ -11,5 +11,6 @@ public class CombineRequest { private String thirdId; private String erpName; private String relId; + private String thirdSys; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/CombineSingleUnitRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/CombineSingleUnitRequest.java new file mode 100644 index 00000000..b0c70ee1 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/CombineSingleUnitRequest.java @@ -0,0 +1,11 @@ +package com.glxp.api.admin.req.basic; + +import com.glxp.api.admin.res.basic.ErpUnitsResponse; +import lombok.Data; + +@Data +public class CombineSingleUnitRequest { + private String key; + private String thirdSys; + private ErpUnitsResponse erpUnitsResponse; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterBasicThirdSysRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterBasicThirdSysRequest.java new file mode 100644 index 00000000..7b5276a1 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterBasicThirdSysRequest.java @@ -0,0 +1,13 @@ +package com.glxp.api.admin.req.basic; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterBasicThirdSysRequest extends ListPageRequest { + + private String thirdId; + private String thirdName; + private Boolean enabled; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterErpGoodsRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterErpGoodsRequest.java index 417dccfb..8f21fb30 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterErpGoodsRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterErpGoodsRequest.java @@ -8,5 +8,6 @@ public class FilterErpGoodsRequest extends ListPageRequest { private String name; private String code; + private String thirdSys; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/PostSmpUdiInfoRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/PostSmpUdiInfoRequest.java index d1e84fa8..fb43e30d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/PostSmpUdiInfoRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/PostSmpUdiInfoRequest.java @@ -1,5 +1,8 @@ package com.glxp.api.admin.req.basic; +import lombok.Data; + +@Data public class PostSmpUdiInfoRequest { /** @@ -50,179 +53,6 @@ public class PostSmpUdiInfoRequest { private String erpName; private String uuid; - public String getNameCode() { - return nameCode; - } - - public void setNameCode(String nameCode) { - this.nameCode = nameCode; - } - - public String getPackLevel() { - return packLevel; - } - - public void setPackLevel(String packLevel) { - this.packLevel = packLevel; - } - - public int getBhxjsl() { - return bhxjsl; - } - - public void setBhxjsl(int bhxjsl) { - this.bhxjsl = bhxjsl; - } - - public int getBhzxxsbzsl() { - return bhzxxsbzsl; - } - - public void setBhzxxsbzsl(int bhzxxsbzsl) { - this.bhzxxsbzsl = bhzxxsbzsl; - } - - public int getZxxsbzbhsydysl() { - return zxxsbzbhsydysl; - } - - public void setZxxsbzbhsydysl(int zxxsbzbhsydysl) { - this.zxxsbzbhsydysl = zxxsbzbhsydysl; - } - - public String getBhxjcpbm() { - return bhxjcpbm; - } - - public void setBhxjcpbm(String bhxjcpbm) { - this.bhxjcpbm = bhxjcpbm; - } - - public String getBzcj() { - return bzcj; - } - - public void setBzcj(String bzcj) { - this.bzcj = bzcj; - } - - public String getDeviceRecordKey() { - return deviceRecordKey; - } - - public void setDeviceRecordKey(String deviceRecordKey) { - this.deviceRecordKey = deviceRecordKey; - } - - public String getCpmctymc() { - return cpmctymc; - } - - public void setCpmctymc(String cpmctymc) { - this.cpmctymc = cpmctymc; - } - - public String getCplb() { - return cplb; - } - - public void setCplb(String cplb) { - this.cplb = cplb; - } - - public String getFlbm() { - return flbm; - } - - public void setFlbm(String flbm) { - this.flbm = flbm; - } - - public String getGgxh() { - return ggxh; - } - - public void setGgxh(String ggxh) { - this.ggxh = ggxh; - } - - public String getQxlb() { - return qxlb; - } - - public void setQxlb(String qxlb) { - this.qxlb = qxlb; - } - - public String getTyshxydm() { - return tyshxydm; - } - - public void setTyshxydm(String tyshxydm) { - this.tyshxydm = tyshxydm; - } - - public String getYlqxzcrbarmc() { - return ylqxzcrbarmc; - } - - public void setYlqxzcrbarmc(String ylqxzcrbarmc) { - this.ylqxzcrbarmc = ylqxzcrbarmc; - } - - public String getZczbhhzbapzbh() { - return zczbhhzbapzbh; - } - - public void setZczbhhzbapzbh(String zczbhhzbapzbh) { - this.zczbhhzbapzbh = zczbhhzbapzbh; - } - - public String getSjcpbm() { - return sjcpbm; - } - - public void setSjcpbm(String sjcpbm) { - this.sjcpbm = sjcpbm; - } - - public int getVersionNumber() { - return versionNumber; - } - - public void setVersionNumber(int versionNumber) { - this.versionNumber = versionNumber; - } - - public int getDiType() { - return diType; - } - - public void setDiType(int diType) { - this.diType = diType; - } - - public String getErpId() { - return erpId; - } - - public void setErpId(String erpId) { - this.erpId = erpId; - } - - public String getErpName() { - return erpName; - } - - public void setErpName(String erpName) { - this.erpName = erpName; - } - - public String getUuid() { - return uuid; - } - - public void setUuid(String uuid) { - this.uuid = uuid; - } + private String ybbm; + private String sptm; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/PostThirdSysPiRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/PostThirdSysPiRequest.java new file mode 100644 index 00000000..88958b23 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/PostThirdSysPiRequest.java @@ -0,0 +1,11 @@ +package com.glxp.api.admin.req.basic; + +import lombok.Data; + +import java.util.List; + +@Data +public class PostThirdSysPiRequest { + private String thirdSys; + private List datas; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/ERPPostBillRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/ERPPostBillRequest.java index 349cd02e..d278a8dc 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/ERPPostBillRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inout/ERPPostBillRequest.java @@ -8,7 +8,8 @@ import java.util.Map; @Data public class ERPPostBillRequest { - + private String billNo; private String billAction; + private String modifyType; private Map> postMap; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/ErpOnhandRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/ErpOnhandRequest.java index 426d2a6b..1ff04f14 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/ErpOnhandRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/ErpOnhandRequest.java @@ -11,7 +11,7 @@ public class ErpOnhandRequest { private String warehouseCode; private String inventoryCode; private List inventoryCodes; - private String udiCode; private String nameCode; + private String thirdSys; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/BussinessTypeFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/BussinessTypeFilterRequest.java index 69821e53..cdb65984 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/BussinessTypeFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/BussinessTypeFilterRequest.java @@ -9,6 +9,6 @@ public class BussinessTypeFilterRequest extends ListPageRequest { private String action; private String name; private String mainAction; - private Boolean enable; + private Boolean enabled; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/CombineUnitRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/CombineUnitRequest.java index 3111ad44..13793f03 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/CombineUnitRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/CombineUnitRequest.java @@ -9,6 +9,6 @@ import java.util.List; public class CombineUnitRequest { List keys; - private String thirdId; + private String thirdSys; List custmandocResponses; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/UnitMaintainFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/UnitMaintainFilterRequest.java index 0b6d4e9d..e42fcc46 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/UnitMaintainFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/UnitMaintainFilterRequest.java @@ -9,4 +9,5 @@ public class UnitMaintainFilterRequest extends ListPageRequest { private String key; private String unitId; private String name; + private String thirdSys; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrCorpRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrCorpRequest.java new file mode 100644 index 00000000..503e3a2a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrCorpRequest.java @@ -0,0 +1,11 @@ +package com.glxp.api.admin.req.thrsys; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterThrCorpRequest extends ListPageRequest { + private String thirdSysFk; + private String unitId; + private String name; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvProductsRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvProductsRequest.java new file mode 100644 index 00000000..fbd157cf --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvProductsRequest.java @@ -0,0 +1,12 @@ +package com.glxp.api.admin.req.thrsys; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterThrInvProductsRequest extends ListPageRequest { + + private String inventoryCode; + private String inventoryName; + private String thirdSysFk; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrOrderDetailRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrOrderDetailRequest.java new file mode 100644 index 00000000..c71221a5 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrOrderDetailRequest.java @@ -0,0 +1,13 @@ +package com.glxp.api.admin.req.thrsys; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + + +@Data +public class FilterThrOrderDetailRequest extends ListPageRequest { + + private String orderIdFk; + private String thirdSysFk; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrOrderRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrOrderRequest.java new file mode 100644 index 00000000..02434b00 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrOrderRequest.java @@ -0,0 +1,12 @@ +package com.glxp.api.admin.req.thrsys; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterThrOrderRequest extends ListPageRequest { + + private String billNo; + private String thirdSysFk; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrProductsRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrProductsRequest.java new file mode 100644 index 00000000..a63a023a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrProductsRequest.java @@ -0,0 +1,10 @@ +package com.glxp.api.admin.req.thrsys; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterThrProductsRequest extends ListPageRequest { + private String name; + private String thirdSysFk; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrCorpRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrCorpRequest.java new file mode 100644 index 00000000..49f1ad90 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrCorpRequest.java @@ -0,0 +1,12 @@ +package com.glxp.api.admin.req.thrsys; + +import com.glxp.api.admin.res.basic.ErpUnitsResponse; +import lombok.Data; + +import java.util.List; + +@Data +public class PostThrCorpRequest { + private String thirdSys; + private List corps; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrInvProductsRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrInvProductsRequest.java new file mode 100644 index 00000000..997d4279 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrInvProductsRequest.java @@ -0,0 +1,13 @@ +package com.glxp.api.admin.req.thrsys; + +import com.glxp.api.admin.res.inventory.ErpOnHandResponse; +import lombok.Data; + +import java.util.List; + +@Data +public class PostThrInvProductsRequest { + + private String thirdSys; + private List datas; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrOrderRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrOrderRequest.java new file mode 100644 index 00000000..fdf5a16a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrOrderRequest.java @@ -0,0 +1,14 @@ +package com.glxp.api.admin.req.thrsys; + +import com.glxp.api.admin.res.inout.ErpOrderResponse; +import lombok.Data; + +import java.util.List; + +@Data +public class PostThrOrderRequest { + + private String thirdSys; + private List datas; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrProductsRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrProductsRequest.java new file mode 100644 index 00000000..d3108283 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrProductsRequest.java @@ -0,0 +1,14 @@ +package com.glxp.api.admin.req.thrsys; + +import com.glxp.api.admin.res.basic.ErpProductsResponse; +import lombok.Data; + +import java.util.List; + +@Data +public class PostThrProductsRequest { + + private String thirdSys; + List datas; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BasicProductThirdSysResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/BasicProductThirdSysResponse.java new file mode 100644 index 00000000..e229e2e1 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/BasicProductThirdSysResponse.java @@ -0,0 +1,10 @@ +package com.glxp.api.admin.res.basic; + +import lombok.Data; + +@Data +public class BasicProductThirdSysResponse { + private String sysName; + private String thirdName; + private String thirdId; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java new file mode 100644 index 00000000..21e5e0e9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java @@ -0,0 +1,33 @@ +package com.glxp.api.admin.res.basic; + +import lombok.Data; + +@Data +public class BussinessTypResponse { + + private Integer id; + private String action; + private String name; + private Boolean enable; + private String remark; + private String mainAction; + private String thirdSysFk; + private String thirdId; + private String thirdName; + private String piQueryUrl; + private Boolean piQueryEnabled; + private String orderQueryUrl; + private Boolean orderQueryEnabled; + private String orderAddUrl; + private Boolean orderAddEnabled; + private String orderDeleteUrl; + private Boolean orderDeleteEnabled; + private String orderModifyUrl; + private Boolean orderModifyEnabled; + private String invPiUrl; + private Boolean invPiEnabled; + private String corpUrl; + private Boolean corpEnabled; + private Boolean enabled; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/ErpProductsResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/ErpProductsResponse.java index cd10bdfe..fb5caf0c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/ErpProductsResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/ErpProductsResponse.java @@ -15,5 +15,6 @@ public class ErpProductsResponse { //辅助字段 private boolean isChecked; + private String thirdSys; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java index 8b98173b..5ea46696 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java @@ -35,5 +35,13 @@ public class UdiRelevanceResponse { private int diType; private String batchNo; private String warehouseName; + private String thirdId1; + private String thirdName1; + private String thirdId2; + private String thirdName2; + private String thirdId3; + private String thirdName3; + private String thirdId4; + private String thirdName4; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inout/ErpOrderResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/inout/ErpOrderResponse.java index 14c73b35..3fecafd4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inout/ErpOrderResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/inout/ErpOrderResponse.java @@ -9,7 +9,7 @@ public class ErpOrderResponse { private String corpId; private String corpName; private String billType; - private boolean signFlag; + private String billFlag; private List subErpOrders; public String getBillNo() { @@ -52,13 +52,6 @@ public class ErpOrderResponse { this.billType = billType; } - public boolean isSignFlag() { - return signFlag; - } - - public void setSignFlag(boolean signFlag) { - this.signFlag = signFlag; - } public List getSubErpOrders() { return subErpOrders; @@ -68,6 +61,14 @@ public class ErpOrderResponse { this.subErpOrders = subErpOrders; } + public String getBillFlag() { + return billFlag; + } + + public void setBillFlag(String billFlag) { + this.billFlag = billFlag; + } + public static class SubErpOrder { private String productId; private String productName; diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/ErpInvProductResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/inventory/ErpInvProductResponse.java index 5cba53c0..5005f236 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/ErpInvProductResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/inventory/ErpInvProductResponse.java @@ -6,10 +6,13 @@ import lombok.Data; public class ErpInvProductResponse { private String code; + private String name; private String batchNo; private String manufacturingDate; private String expirationDate; private String warehouseCode; private String warehouseName; - private String count; + private String registerCertNo; + private String spec; + private Integer count; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicThirdSysService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicThirdSysService.java new file mode 100644 index 00000000..ea000068 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicThirdSysService.java @@ -0,0 +1,18 @@ +package com.glxp.api.admin.service.basic; + +import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; +import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest; + +import java.util.List; + +public interface BasicThirdSysService { + + + boolean updateBasicThiSys(BasicThirdSysEntity basicThirdSysEntity); + + BasicThirdSysEntity selectByThirdId(String thirdId); + + List filterBasicThiSys(FilterBasicThirdSysRequest filterBasicThirdSysRequest); + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicUnitMaintainService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicUnitMaintainService.java index fc4699b0..683ed876 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicUnitMaintainService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicUnitMaintainService.java @@ -13,9 +13,7 @@ public interface BasicUnitMaintainService { boolean insertBasicUnitMaintain(BasicUnitMaintainEntity basicUnitMaintainEntity); - boolean insert(BasicUnitMaintainEntity basicUnitMaintainEntity); - - boolean updateById(BasicUnitMaintainSaveRequest basicUnitMaintainSaveRequest); + boolean updateById(BasicUnitMaintainEntity basicUnitMaintainEntity); boolean deleteById(String id); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessTypeService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessTypeService.java index efe57269..87c29270 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessTypeService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessTypeService.java @@ -2,6 +2,7 @@ package com.glxp.api.admin.service.basic; import com.glxp.api.admin.entity.basic.BussinessTypeEntity; import com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest; +import com.glxp.api.admin.res.basic.BussinessTypResponse; import java.util.List; @@ -9,9 +10,13 @@ public interface BussinessTypeService { List filterList(BussinessTypeFilterRequest bussinessTypeFilterRequest); + List filterJoinList(BussinessTypeFilterRequest bussinessTypeFilterRequest); + BussinessTypeEntity findBTByAction(String action); - BussinessTypeEntity findBTByName(String action); + BussinessTypeEntity findBTByName(String name); + + BussinessTypResponse findJoinBTByAction(String action); boolean insertBussinessType(BussinessTypeEntity bussinessTypeEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysServiceImpl.java new file mode 100644 index 00000000..36739df1 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysServiceImpl.java @@ -0,0 +1,43 @@ +package com.glxp.api.admin.service.basic.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.basic.BasicThirdSysDao; +import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; +import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest; +import com.glxp.api.admin.service.basic.BasicThirdSysService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class BasicThirdSysServiceImpl implements BasicThirdSysService { + + @Resource + BasicThirdSysDao basicThirdSysDao; + + @Override + public boolean updateBasicThiSys(BasicThirdSysEntity basicThirdSysEntity) { + return basicThirdSysDao.updateBasicThiSys(basicThirdSysEntity); + } + + @Override + public BasicThirdSysEntity selectByThirdId(String thirdId) { + return basicThirdSysDao.selectByThirdId(thirdId); + } + + @Override + public List filterBasicThiSys(FilterBasicThirdSysRequest filterBasicThirdSysRequest) { + if (filterBasicThirdSysRequest == null) { + return Collections.emptyList(); + } + + if (filterBasicThirdSysRequest.getPage() != null) { + int offset = (filterBasicThirdSysRequest.getPage() - 1) * filterBasicThirdSysRequest.getLimit(); + PageHelper.offsetPage(offset, filterBasicThirdSysRequest.getLimit()); + } + List data = basicThirdSysDao.filterBasicThiSys(filterBasicThirdSysRequest); + return data; + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java index ea8679e9..aa434243 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java @@ -35,12 +35,7 @@ public class BasicUnitMaintainServiceImpl implements BasicUnitMaintainService { } @Override - public boolean insert(BasicUnitMaintainEntity basicUnitMaintainEntity) { - return basicUnitMaintainDao.insert(basicUnitMaintainEntity); - } - - @Override - public boolean updateById(BasicUnitMaintainSaveRequest basicUnitMaintainSaveRequest) { + public boolean updateById(BasicUnitMaintainEntity basicUnitMaintainSaveRequest) { return basicUnitMaintainDao.updateById(basicUnitMaintainSaveRequest); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessTypeServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessTypeServiceImpl.java index 1c35e92b..1ae7fab1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessTypeServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessTypeServiceImpl.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.admin.dao.basic.BussinessTypeDao; import com.glxp.api.admin.entity.basic.BussinessTypeEntity; import com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest; +import com.glxp.api.admin.res.basic.BussinessTypResponse; import com.glxp.api.admin.service.basic.BussinessTypeService; import org.springframework.stereotype.Service; @@ -30,6 +31,19 @@ public class BussinessTypeServiceImpl implements BussinessTypeService { return data; } + @Override + public List filterJoinList(BussinessTypeFilterRequest bussinessTypeFilterRequest) { + if (bussinessTypeFilterRequest == null) { + return Collections.emptyList(); + } + if(bussinessTypeFilterRequest.getPage()!=null){ + int offset = (bussinessTypeFilterRequest.getPage() - 1) * bussinessTypeFilterRequest.getLimit(); + PageHelper.offsetPage(offset, bussinessTypeFilterRequest.getLimit()); + } + List data = bussinessTypeDao.filterJoinList(bussinessTypeFilterRequest); + return data; + } + @Override public BussinessTypeEntity findBTByAction(String action) { BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest(); @@ -52,6 +66,18 @@ public class BussinessTypeServiceImpl implements BussinessTypeService { return null; } + @Override + public BussinessTypResponse findJoinBTByAction(String action) { + BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest(); + bussinessTypeFilterRequest.setAction(action); + bussinessTypeFilterRequest.setEnabled(true); + List data = bussinessTypeDao.filterJoinList(bussinessTypeFilterRequest); + if (data != null && data.size() > 0) { + return data.get(0); + } + return null; + } + @Override public boolean insertBussinessType(BussinessTypeEntity bussinessTypeEntity) { return bussinessTypeDao.insertBussinessType(bussinessTypeEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpService.java new file mode 100644 index 00000000..f0e12509 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpService.java @@ -0,0 +1,20 @@ +package com.glxp.api.admin.service.thrsys; + +import com.glxp.api.admin.entity.thrsys.ThrCorpEntity; +import com.glxp.api.admin.req.thrsys.FilterThrCorpRequest; + +import java.util.List; + +public interface ThrCorpService { + + List filterThrCorps(FilterThrCorpRequest filterThrCorpRequest); + + boolean insertThrCorps(ThrCorpEntity thrCorpEntity); + + boolean insertThrCorpss(List thrCorpEntitys); + + boolean updateThrCorps(ThrCorpEntity thrCorpEntity); + + boolean deleteById(String id); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvProductsService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvProductsService.java new file mode 100644 index 00000000..72609dfd --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvProductsService.java @@ -0,0 +1,21 @@ +package com.glxp.api.admin.service.thrsys; + +import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity; +import com.glxp.api.admin.req.thrsys.FilterThrInvProductsRequest; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface ThrInvProductsService { + + List filterThrInvProductss(FilterThrInvProductsRequest filterThrInvProductsRequest); + + boolean insertThrInvProduct(ThrInvProductsEntity thrInvProductsEntity); + + boolean insertThrInvProducts(List thrInvProductsEntities); + + boolean updateThrInvProducts(ThrInvProductsEntity thrInvProductsEntity); + + boolean deleteById(String id); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderDetailService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderDetailService.java new file mode 100644 index 00000000..9c0bd95b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderDetailService.java @@ -0,0 +1,21 @@ +package com.glxp.api.admin.service.thrsys; + +import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity; +import com.glxp.api.admin.req.thrsys.FilterThrOrderDetailRequest; + +import java.util.List; + +public interface ThrOrderDetailService { + + + List filterThrOrderDetailDetail(FilterThrOrderDetailRequest filterThrOrderDetailRequest); + + boolean insertThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity); + + boolean insertThrOrderDetails(List thrOrderDetailEntities); + + boolean updateThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity); + + boolean deleteById(String id); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderService.java new file mode 100644 index 00000000..3f1453af --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderService.java @@ -0,0 +1,22 @@ +package com.glxp.api.admin.service.thrsys; + +import com.glxp.api.admin.entity.thrsys.ThrOrderEntity; +import com.glxp.api.admin.req.thrsys.FilterThrOrderRequest; + +import java.util.List; + +public interface ThrOrderService { + + List filterThrOrder(FilterThrOrderRequest filterThrOrderRequest); + + ThrOrderEntity findByUnique(String billNo, String thirdSysFk); + + boolean insertThrOrder(ThrOrderEntity thrCorpEntity); + + boolean insertThrOrders(List thrOrderEntities); + + boolean updateThrOrder(ThrOrderEntity thrOrderEntity); + + boolean deleteById(String id); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsService.java new file mode 100644 index 00000000..30dfac2b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsService.java @@ -0,0 +1,21 @@ +package com.glxp.api.admin.service.thrsys; + +import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; +import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; + +import java.util.List; + +public interface ThrProductsService { + + + List filterThrProductsRequest(FilterThrProductsRequest filterThrProductsRequest); + + boolean insertThrProducts(ThrProductsEntity thrProductsEntity); + + boolean insertThrProductss(List thrProductsEntities); + + boolean updateThrProducts(ThrProductsEntity thrProductsEntity); + + boolean deleteById(String id); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpServiceImpl.java new file mode 100644 index 00000000..b00bf862 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpServiceImpl.java @@ -0,0 +1,52 @@ +package com.glxp.api.admin.service.thrsys.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.thrsys.ThrCorpDao; +import com.glxp.api.admin.entity.thrsys.ThrCorpEntity; +import com.glxp.api.admin.req.thrsys.FilterThrCorpRequest; +import com.glxp.api.admin.service.thrsys.ThrCorpService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class ThrCorpServiceImpl implements ThrCorpService { + + @Resource + private ThrCorpDao thrCorpDao; + + @Override + public List filterThrCorps(FilterThrCorpRequest filterThrCorpRequest) { + if (filterThrCorpRequest == null) { + return Collections.emptyList(); + } + if (filterThrCorpRequest.getPage() != null) { + int offset = (filterThrCorpRequest.getPage() - 1) * filterThrCorpRequest.getLimit(); + PageHelper.offsetPage(offset, filterThrCorpRequest.getLimit()); + } + List data = thrCorpDao.filterThrCorps(filterThrCorpRequest); + return data; + } + + @Override + public boolean insertThrCorps(ThrCorpEntity thrCorpEntity) { + return thrCorpDao.insertThrCorps(thrCorpEntity); + } + + @Override + public boolean insertThrCorpss(List thrCorpEntitys) { + return thrCorpDao.insertThrCorpss(thrCorpEntitys); + } + + @Override + public boolean updateThrCorps(ThrCorpEntity thrCorpEntity) { + return thrCorpDao.updateThrCorps(thrCorpEntity); + } + + @Override + public boolean deleteById(String id) { + return thrCorpDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvProductsServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvProductsServiceImpl.java new file mode 100644 index 00000000..f033acc4 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvProductsServiceImpl.java @@ -0,0 +1,54 @@ +package com.glxp.api.admin.service.thrsys.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.thrsys.ThrCorpDao; +import com.glxp.api.admin.dao.thrsys.ThrInvProductsDao; +import com.glxp.api.admin.entity.thrsys.ThrCorpEntity; +import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity; +import com.glxp.api.admin.req.thrsys.FilterThrInvProductsRequest; +import com.glxp.api.admin.service.thrsys.ThrInvProductsService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class ThrInvProductsServiceImpl implements ThrInvProductsService { + + @Resource + private ThrInvProductsDao thrInvProductsDao; + + @Override + public List filterThrInvProductss(FilterThrInvProductsRequest filterThrInvProductsRequest) { + if (filterThrInvProductsRequest == null) { + return Collections.emptyList(); + } + if (filterThrInvProductsRequest.getPage() != null) { + int offset = (filterThrInvProductsRequest.getPage() - 1) * filterThrInvProductsRequest.getLimit(); + PageHelper.offsetPage(offset, filterThrInvProductsRequest.getLimit()); + } + List data = thrInvProductsDao.filterThrInvProductss(filterThrInvProductsRequest); + return data; + } + + @Override + public boolean insertThrInvProduct(ThrInvProductsEntity thrInvProductsEntity) { + return thrInvProductsDao.insertThrInvProduct(thrInvProductsEntity); + } + + @Override + public boolean insertThrInvProducts(List thrInvProductsEntities) { + return thrInvProductsDao.insertThrInvProducts(thrInvProductsEntities); + } + + @Override + public boolean updateThrInvProducts(ThrInvProductsEntity thrInvProductsEntity) { + return thrInvProductsDao.updateThrInvProducts(thrInvProductsEntity); + } + + @Override + public boolean deleteById(String id) { + return thrInvProductsDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderDetailServiceImpl.java new file mode 100644 index 00000000..53df2c67 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderDetailServiceImpl.java @@ -0,0 +1,53 @@ +package com.glxp.api.admin.service.thrsys.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.thrsys.ThrOrderDetailDao; +import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity; +import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity; +import com.glxp.api.admin.req.thrsys.FilterThrOrderDetailRequest; +import com.glxp.api.admin.service.thrsys.ThrOrderDetailService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class ThrOrderDetailServiceImpl implements ThrOrderDetailService { + + @Resource + ThrOrderDetailDao thrOrderDetailDao; + + @Override + public List filterThrOrderDetailDetail(FilterThrOrderDetailRequest filterThrOrderDetailRequest) { + if (filterThrOrderDetailRequest == null) { + return Collections.emptyList(); + } + if (filterThrOrderDetailRequest.getPage() != null) { + int offset = (filterThrOrderDetailRequest.getPage() - 1) * filterThrOrderDetailRequest.getLimit(); + PageHelper.offsetPage(offset, filterThrOrderDetailRequest.getLimit()); + } + List data = thrOrderDetailDao.filterThrOrderDetailDetail(filterThrOrderDetailRequest); + return data; + } + + @Override + public boolean insertThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity) { + return thrOrderDetailDao.insertThrOrderDetail(thrOrderDetailEntity); + } + + @Override + public boolean insertThrOrderDetails(List thrOrderDetailEntities) { + return thrOrderDetailDao.insertThrOrderDetails(thrOrderDetailEntities); + } + + @Override + public boolean updateThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity) { + return thrOrderDetailDao.updateThrOrderDetail(thrOrderDetailEntity); + } + + @Override + public boolean deleteById(String id) { + return thrOrderDetailDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderServiceImpl.java new file mode 100644 index 00000000..bc49b836 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderServiceImpl.java @@ -0,0 +1,63 @@ +package com.glxp.api.admin.service.thrsys.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.thrsys.ThrOrderDao; +import com.glxp.api.admin.entity.thrsys.ThrOrderEntity; +import com.glxp.api.admin.req.thrsys.FilterThrOrderRequest; +import com.glxp.api.admin.service.thrsys.ThrOrderService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class ThrOrderServiceImpl implements ThrOrderService { + @Resource + private ThrOrderDao thrOrderDao; + + @Override + public List filterThrOrder(FilterThrOrderRequest filterThrOrderRequest) { + if (filterThrOrderRequest == null) { + return Collections.emptyList(); + } + if (filterThrOrderRequest.getPage() != null) { + int offset = (filterThrOrderRequest.getPage() - 1) * filterThrOrderRequest.getLimit(); + PageHelper.offsetPage(offset, filterThrOrderRequest.getLimit()); + } + List data = thrOrderDao.filterThrOrder(filterThrOrderRequest); + return data; + } + + @Override + public ThrOrderEntity findByUnique(String billNo, String thirdSysFk) { + FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); + filterThrOrderRequest.setBillNo(billNo); + filterThrOrderRequest.setThirdSysFk(thirdSysFk); + List thrOrderEntities = filterThrOrder(filterThrOrderRequest); + if (thrOrderEntities != null && thrOrderEntities.size() > 0) { + return thrOrderEntities.get(0); + } + return null; + } + + @Override + public boolean insertThrOrder(ThrOrderEntity thrCorpEntity) { + return thrOrderDao.insertThrOrder(thrCorpEntity); + } + + @Override + public boolean insertThrOrders(List thrOrderEntities) { + return thrOrderDao.insertThrOrders(thrOrderEntities); + } + + @Override + public boolean updateThrOrder(ThrOrderEntity thrOrderEntity) { + return thrOrderDao.updateThrOrder(thrOrderEntity); + } + + @Override + public boolean deleteById(String id) { + return thrOrderDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsServiceImpl.java new file mode 100644 index 00000000..2e6f81e8 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsServiceImpl.java @@ -0,0 +1,54 @@ +package com.glxp.api.admin.service.thrsys.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.thrsys.ThrProductsDao; +import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; +import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; +import com.glxp.api.admin.service.thrsys.ThrProductsService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class ThrProductsServiceImpl implements ThrProductsService { + + + @Resource + ThrProductsDao thrProductsDao; + + + @Override + public List filterThrProductsRequest(FilterThrProductsRequest filterThrProductsRequest) { + if (filterThrProductsRequest == null) { + return Collections.emptyList(); + } + if (filterThrProductsRequest.getPage() != null) { + int offset = (filterThrProductsRequest.getPage() - 1) * filterThrProductsRequest.getLimit(); + PageHelper.offsetPage(offset, filterThrProductsRequest.getLimit()); + } + List data = thrProductsDao.filterThrProductsRequest(filterThrProductsRequest); + return data; + } + + @Override + public boolean insertThrProducts(ThrProductsEntity thrProductsEntity) { + return thrProductsDao.insertThrProducts(thrProductsEntity); + } + + @Override + public boolean insertThrProductss(List thrProductsEntities) { + return thrProductsDao.insertThrProductss(thrProductsEntities); + } + + @Override + public boolean updateThrProducts(ThrProductsEntity thrProductsEntity) { + return thrProductsDao.updateThrProducts(thrProductsEntity); + } + + @Override + public boolean deleteById(String id) { + return thrProductsDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateErpDataTask.java b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateErpDataTask.java index ce89f33b..4000c835 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateErpDataTask.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateErpDataTask.java @@ -1,9 +1,11 @@ package com.glxp.api.admin.thread; import com.glxp.api.admin.dao.info.ScheduledDao; +import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; import com.glxp.api.admin.entity.info.ScheduledEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; import com.glxp.api.admin.req.info.ScheduledRequest; +import com.glxp.api.admin.service.basic.BasicThirdSysService; import com.glxp.api.admin.service.info.SystemParamConfigService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,6 +29,8 @@ public class BasicUpdateErpDataTask implements SchedulingConfigurer { protected ScheduledDao scheduledDao; @Resource SystemParamConfigService systemParamConfigService; + @Resource + BasicThirdSysService basicThirdSysService; @Override public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) { @@ -48,10 +52,18 @@ public class BasicUpdateErpDataTask implements SchedulingConfigurer { logger.info("定时更新下载ERP产品信息"); SystemParamConfigEntity isUpdate = systemParamConfigService.selectByParamKey("erp_updateErpData"); if (isUpdate != null && "1".equals(isUpdate.getParamValue())) { - SystemParamConfigEntity product = systemParamConfigService.selectByParamKey("erp_products_query"); - SystemParamConfigEntity onHand = systemParamConfigService.selectByParamKey("erp_onhand_query"); - if (product != null && onHand != null) - updateproductService.updateProduct(product.getParamValue(), onHand.getParamValue()); + SystemParamConfigEntity thirdSys = systemParamConfigService.selectByParamKey("erp_updateErpData_thirdSys"); + BasicThirdSysEntity basicThirdSysEntity; + if (thirdSys != null && thirdSys.getParamValue() != null) { + basicThirdSysEntity = basicThirdSysService.selectByThirdId(thirdSys.getParamValue()); + } else + basicThirdSysEntity = basicThirdSysService.selectByThirdId("thirdId"); + if (basicThirdSysEntity.getPiQueryUrl() != null && basicThirdSysEntity.getInvPiUrl() != null){ + updateproductService.updateProduct(basicThirdSysEntity.getOrderQueryUrl(), basicThirdSysEntity.getInvPiUrl()); + }else { + logger.info("接口地址未设置"); + } + } else { logger.info("暂未设置，不更新"); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateproductService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateproductService.java index 1ca2388d..a70c1b2b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateproductService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateproductService.java @@ -8,6 +8,7 @@ import com.glxp.api.admin.req.basic.FilterErpGoodsRequest; import com.glxp.api.admin.req.inventory.ErpOnhandRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.ErpProductsResponse; +import com.glxp.api.admin.res.inventory.ErpInvProductResponse; import com.glxp.api.admin.res.inventory.ErpOnHandResponse; import com.glxp.api.admin.service.basic.UdiInfoService; import com.glxp.api.admin.service.basic.UdiRelevanceService; @@ -107,16 +108,16 @@ public class BasicUpdateproductService { ErpOnhandRequest erpOnhandRequest = new ErpOnhandRequest(); erpOnhandRequest.setInventoryCodes(inventoryCodes); - List erpOnHandResponses = new ErpInvClient().getOnHand(erpOnhandRequest, onHandUrl); + List erpOnHandResponses = new ErpInvClient().getInvPrdoduct(erpOnhandRequest, onHandUrl); if (erpOnHandResponses != null) { - Map> map = erpOnHandResponses.stream().collect(Collectors.groupingBy(ErpOnHandResponse::getInventoryCode)); - for (List onHandResponses : map.values()) { + Map> map = erpOnHandResponses.stream().collect(Collectors.groupingBy(ErpInvProductResponse::getCode)); + for (List onHandResponses : map.values()) { if (onHandResponses != null && onHandResponses.size() > 0) { - ErpOnHandResponse onhandQueryResponse = onHandResponses.get(0); + ErpInvProductResponse onhandQueryResponse = onHandResponses.get(0); if (onhandQueryResponse.getCount() > 0) { UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); - udiInfoEntity.setNameCode(onhandQueryResponse.getInventoryCode()); - udiInfoEntity.setCpmctymc(onhandQueryResponse.getInventoryName()); + udiInfoEntity.setNameCode(onhandQueryResponse.getCode()); + udiInfoEntity.setCpmctymc(onhandQueryResponse.getName()); udiInfoEntity.setGgxh(onhandQueryResponse.getSpec()); udiInfoEntity.setUuid(CustomUtil.getUUId()); udiInfoEntity.setYlqxzcrbarmc(invmandocResponses.get(0).getManufactory()); @@ -124,14 +125,11 @@ public class BasicUpdateproductService { udiInfoService.insertUdiInfo(udiInfoEntity); UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity(); udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid()); - udiRelevanceEntity1.setThirdId(onhandQueryResponse.getInventoryCode()); - udiRelevanceEntity1.setThirdName(onhandQueryResponse.getInventoryName()); + udiRelevanceEntity1.setThirdId(onhandQueryResponse.getCode()); + udiRelevanceEntity1.setThirdName(onhandQueryResponse.getName()); udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime()); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity1); } - -// } - } } } else { diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/InvImportStockService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/InvImportStockService.java index 8aa03a5e..5359b0a7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/InvImportStockService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/InvImportStockService.java @@ -1,6 +1,8 @@ package com.glxp.api.admin.thread; +import com.glxp.api.admin.config.WebSocketServer; import com.glxp.api.admin.constant.ConstantType; +import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; import com.glxp.api.admin.entity.basic.UdiInfoEntity; import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; @@ -18,6 +20,8 @@ import com.glxp.api.admin.req.inventory.ErpOnhandRequest; import com.glxp.api.admin.res.basic.UdiRelevanceResponse; import com.glxp.api.admin.res.inventory.ErpInvProductResponse; import com.glxp.api.admin.res.inventory.ErpOnHandResponse; +import com.glxp.api.admin.service.basic.BasicThirdSysService; +import com.glxp.api.admin.service.basic.BussinessTypeService; import com.glxp.api.admin.service.basic.UdiInfoService; import com.glxp.api.admin.service.basic.UdiRelevanceService; import com.glxp.api.admin.service.info.SystemParamConfigService; @@ -51,6 +55,9 @@ public class InvImportStockService { private UdiInfoService productInfoService; @Resource private SystemParamConfigService systemParamConfigService; + @Resource + private BasicThirdSysService basicThirdSysService; + final Logger logger = LoggerFactory.getLogger(InvImportStockService.class); @Async @@ -59,10 +66,11 @@ public class InvImportStockService { int page = 1; int limit = 1000; FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); - SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_inv_product_query"); + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_stockprint_get_invpi"); + BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(systemParamConfigEntity.getParamValue()); String url; - if (systemParamConfigEntity != null) { - url = systemParamConfigEntity.getParamValue(); + if (basicThirdSysEntity != null) { + url = basicThirdSysEntity.getInvPiUrl(); while (true) { filterUdiInfoRequest.setPage(page); filterUdiInfoRequest.setLimit(limit); @@ -77,7 +85,7 @@ public class InvImportStockService { for (ErpInvProductResponse onhandQueryResponse : uOnhandQueryResponses) { StockPrintEntity stockPrintEntity = new StockPrintEntity(); stockPrintEntity.setBatchNo(onhandQueryResponse.getBatchNo()); - stockPrintEntity.setNnum(onhandQueryResponse.getCount()); + stockPrintEntity.setNnum(onhandQueryResponse.getCount() + ""); stockPrintEntity.setWarehouseName(onhandQueryResponse.getWarehouseName()); stockPrintEntity.setWarehouseCode(onhandQueryResponse.getWarehouseCode()); stockPrintEntity.setExpireDate(onhandQueryResponse.getExpirationDate()); @@ -101,7 +109,9 @@ public class InvImportStockService { break; } } + WebSocketServer.sendInfo("后台已更新完成，请刷新查看", "sid"); } else { + WebSocketServer.sendInfo("自动更新失败，ERP库存产品信息查询接口地址未定义", "err"); logger.error("ERP库存产品信息查询接口地址未定义！"); } @@ -245,7 +255,7 @@ public class InvImportStockService { if (udiRelevanceEntities != null && udiRelevanceEntities.size() == 1) { ErpOnhandRequest erpOnhandRequest = new ErpOnhandRequest(); erpOnhandRequest.setInventoryCode(udiRelevanceEntities.get(0).getThirdId()); - List erpOnHandResponses = new ErpInvClient().getOnHand(erpOnhandRequest, url); + List erpOnHandResponses = new ErpInvClient().getInvPrdoduct(erpOnhandRequest, url); if (erpOnHandResponses != null && erpOnHandResponses.size() > 0) { for (int i = 0; i < erpOnHandResponses.size(); i++) { if (erpOnHandResponses.get(i).getBatchNo().equals(erpOrderEntity.getBatchNo()) diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/IoModifyErpTask.java b/api-admin/src/main/java/com/glxp/api/admin/thread/IoModifyErpTask.java index 90f23a42..006a381a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/IoModifyErpTask.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/IoModifyErpTask.java @@ -9,9 +9,12 @@ import com.glxp.api.admin.entity.info.ScheduledEntity; import com.glxp.api.admin.entity.inout.OrderEntity; import com.glxp.api.admin.entity.inout.ErpOrderEntity; import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; +import com.glxp.api.admin.req.inout.ERPPostBillRequest; import com.glxp.api.admin.req.inout.OrderFilterRequest; import com.glxp.api.admin.req.inout.USignRequest; import com.glxp.api.admin.req.info.ScheduledRequest; +import com.glxp.api.admin.res.basic.BussinessTypResponse; +import com.glxp.api.admin.service.basic.BussinessTypeService; import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.service.inout.OrderDetailService; import com.glxp.api.admin.service.inout.OrderService; @@ -43,6 +46,8 @@ public class IoModifyErpTask implements SchedulingConfigurer { OrderDetailService myErpOrderService; @Resource private SystemParamConfigService systemParamConfigService; + @Resource + private BussinessTypeService bussinessTypeService; @Override public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) { @@ -69,7 +74,7 @@ public class IoModifyErpTask implements SchedulingConfigurer { String isErpSaleOutModify = systemParamConfigEntity.getParamValue(); systemParamConfigEntity = systemParamConfigService.selectByParamKey("erpPruchaseModify"); String isErpPruchaseModify = systemParamConfigEntity.getParamValue(); - if ("1".equals(isErpSaleOutModify)|| "1".equals(isErpPruchaseModify)) { + if ("1".equals(isErpSaleOutModify) || "1".equals(isErpPruchaseModify)) { OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); orderFilterRequest.setExportStatus(ConstantStatus.ORDER_EXPORT_UN); orderFilterRequest.setContrastStatus(ConstantStatus.ORDER_CHECK_SUCCESS); @@ -81,10 +86,10 @@ public class IoModifyErpTask implements SchedulingConfigurer { filterErpOrderRequest.setLimit(100); filterErpOrderRequest.setOrderId(orderEntity.getId()); List erpOrderEntities = myErpOrderService.filterMyErpOrder(filterErpOrderRequest); - SystemParamConfigEntity systemParamConfigEntity1 = systemParamConfigService.selectByParamKey("erp_order_modify"); + BussinessTypResponse bussinessTypResponse = bussinessTypeService.findJoinBTByAction(orderEntity.getAction()); - if (systemParamConfigEntity1 != null) { - String url = systemParamConfigEntity1.getParamValue(); + if (bussinessTypResponse.getOrderModifyUrl() != null) { + String url = bussinessTypResponse.getOrderModifyUrl(); if (erpOrderEntities != null && !erpOrderEntities.isEmpty()) { Map> listMap = erpOrderEntities.stream().collect(Collectors.groupingBy(ErpOrderEntity::getErpOrderId)); if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { @@ -109,28 +114,35 @@ public class IoModifyErpTask implements SchedulingConfigurer { } } + + + SystemParamConfigEntity saleOutSign = systemParamConfigService.selectByParamKey("erpSaleOutSign"); + String isSaleOutSign = saleOutSign.getParamValue(); + saleOutSign = systemParamConfigService.selectByParamKey("erpPruchaseSign"); + String isPruchaseSign = saleOutSign.getParamValue(); OrderFilterRequest signFilterRequest = new OrderFilterRequest(); signFilterRequest.setSignStatus(ConstantStatus.ORDER_SIGN_UN); signFilterRequest.setContrastStatus(ConstantStatus.ORDER_CHECK_SUCCESS); List signsOrderEntities = orderService.findAllOrders(signFilterRequest); if (signsOrderEntities != null && signsOrderEntities.size() > 0) { - SystemParamConfigEntity systemParamConfigEntity2 = systemParamConfigService.selectByParamKey("erp_order_sign"); - if (systemParamConfigEntity2 != null) { - String url = systemParamConfigEntity2.getParamValue(); - for (OrderEntity orderEntity : signsOrderEntities) { + for (OrderEntity orderEntity : signsOrderEntities) { + BussinessTypResponse bussinessTypResponse = bussinessTypeService.findJoinBTByAction(orderEntity.getAction()); + if (bussinessTypResponse != null && bussinessTypResponse.getOrderModifyUrl() != null) { + String url = bussinessTypResponse.getOrderModifyUrl(); FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest(); filterErpOrderRequest.setOrderId(orderEntity.getId()); List erpOrderEntities = myErpOrderService.filterMyErpOrder(filterErpOrderRequest); if (erpOrderEntities != null && !erpOrderEntities.isEmpty()) { Map> listMap = erpOrderEntities.stream().collect(Collectors.groupingBy(ErpOrderEntity::getErpOrderId)); if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { - if ("1".equals(isErpSaleOutModify)) { + if ("1".equals(isSaleOutSign)) { if (listMap != null && listMap.size() > 0) { for (String key : listMap.keySet()) { - USignRequest signRequest = new USignRequest(); - signRequest.setBillcode(key); - signRequest.setBillcode(orderEntity.getAction()); - BaseResponse baseResponse = new ErpOrderClient().signBill(signRequest, url); + ERPPostBillRequest signRequest = new ERPPostBillRequest(); + signRequest.setBillNo(key); + signRequest.setBillAction(orderEntity.getAction()); + signRequest.setModifyType("sign"); + BaseResponse baseResponse = new ErpOrderClient().postBill(signRequest, url); if (baseResponse != null && baseResponse.getCode() == 20000) { orderService.updateSignStatus(orderEntity.getId(), ConstantStatus.ORDER_SIGN_ED); } @@ -138,13 +150,14 @@ public class IoModifyErpTask implements SchedulingConfigurer { } } } else { - if ("1".equals(isErpPruchaseModify)) { + if ("1".equals(isPruchaseSign)) { if (listMap != null && listMap.size() > 0) { for (String key : listMap.keySet()) { - USignRequest signRequest = new USignRequest(); - signRequest.setBillcode(key); - signRequest.setBillcode(orderEntity.getAction()); - BaseResponse baseResponse = new ErpOrderClient().signBill(signRequest, url); + ERPPostBillRequest signRequest = new ERPPostBillRequest(); + signRequest.setBillNo(key); + signRequest.setBillAction(orderEntity.getAction()); + signRequest.setModifyType("sign"); + BaseResponse baseResponse = new ErpOrderClient().postBill(signRequest, url); if (baseResponse != null && baseResponse.getCode() == 20000) { orderService.updateSignStatus(orderEntity.getId(), ConstantStatus.ORDER_SIGN_ED); } @@ -153,9 +166,9 @@ public class IoModifyErpTask implements SchedulingConfigurer { } } } + } else { + logger.error("ERP单据修改接口地址未定义"); } - } else { - logger.error("ERP单据签字接口地址未定义"); } } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java index 187711d5..d0efe8f7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java @@ -1,5 +1,6 @@ package com.glxp.api.admin.thread; +import com.glxp.api.admin.config.WebSocketServer; import com.glxp.api.admin.constant.ConstantStatus; import com.glxp.api.admin.controller.inout.utils.DataTransUtil; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; @@ -13,6 +14,9 @@ import com.glxp.api.admin.req.inout.CommitRequest; import com.glxp.api.admin.req.inout.OrderFilterRequest; import com.glxp.api.admin.req.inout.PostOrderRequest; import com.glxp.api.admin.req.inout.WarehouseQueryRequest; +import com.glxp.api.admin.res.basic.BussinessTypResponse; +import com.glxp.api.admin.service.basic.BasicThirdSysService; +import com.glxp.api.admin.service.basic.BussinessTypeService; import com.glxp.api.admin.service.basic.UdiInfoService; import com.glxp.api.admin.service.basic.UdiRelevanceService; import com.glxp.api.admin.service.info.SystemParamConfigService; @@ -53,6 +57,8 @@ public class IoTransInoutService { private CodesTempService codesTempService; @Autowired private SystemParamConfigService systemParamConfigService; + @Resource + private BussinessTypeService bussinessTypeService; //生成订单，插入零时表 @Async @@ -144,7 +150,7 @@ public class IoTransInoutService { WarehouseQueryRequest tempQuery = new WarehouseQueryRequest(); tempQuery.setOrderId(orderEntity.getId()); List temps = codesTempService.findByOrderId(tempQuery); - if (orderEntity.getErpFk() != null) { + if (orderEntity.getErpFk() != null && !"".equals(orderEntity.getErpFk())) { orderService.updateOrderStatus(orderEntity.getId(), ConstantStatus.ORDER_STATUS_CHECK); } else { //因为只需用到条码，所以不需要重新读取 @@ -179,15 +185,15 @@ public class IoTransInoutService { List erpIds = DataTransUtil.strToErpList(orderEntity.getErpFk()); List transData = warehouseService.findByReceiptId(orderEntity.getId()); if (erpIds != null && erpIds.size() > 0) { - SystemParamConfigEntity systemParamConfigEntityBUMErpQuery = systemParamConfigService.selectByParamKey("erp_order_query"); - if (systemParamConfigEntityBUMErpQuery == null) { + BussinessTypResponse bussinessTypResponse = bussinessTypeService.findJoinBTByAction(orderEntity.getAction()); + if (bussinessTypResponse == null || bussinessTypResponse.getOrderQueryUrl() == null) { orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); orderEntity.setRemark("获取ERP出入库单据接口地址未定义"); orderService.updateOrder(orderEntity); } else { - String erpOrderUrl = systemParamConfigEntityBUMErpQuery.getParamValue(); - List cloudErps = new ErpOrderClient(erpOrderUrl).getErpOrder(erpIds,orderEntity.getAction()); + String erpOrderUrl = bussinessTypResponse.getOrderQueryUrl(); + List cloudErps = new ErpOrderClient(erpOrderUrl).getErpOrder(erpIds, orderEntity.getAction()); if (cloudErps != null && cloudErps.size() > 0) { List returnOrders = new ContrastErpUtil().transErp(cloudErps, udiRelevanceService, orderEntity.getId()); ErpOrderEntity temp = returnOrders.get(0); @@ -218,6 +224,8 @@ public class IoTransInoutService { orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); orderEntity.setRemark("未选入ERP单据进行校验，请手动选择"); orderService.updateOrder(orderEntity); + myErpOrderService.deleteByOrderId(orderEntity.getId()); + new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, transData); } } @@ -227,6 +235,7 @@ public class IoTransInoutService { OrderEntity orderEntity = orderService.findById(commitRequest.getOrderId()); if (orderEntity != null) { transInout(orderEntity); + WebSocketServer.sendInfo("重码校验已完成，请刷新查看！", null); } } @@ -235,6 +244,7 @@ public class IoTransInoutService { public void repeatCheck(String orderId) { OrderEntity orderEntity = orderService.findById(orderId); checkOrder(orderEntity); + WebSocketServer.sendInfo("单据:"+orderId+"校验已完成，请刷新查看！", null); } diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml new file mode 100644 index 00000000..98247e04 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml @@ -0,0 +1,50 @@ + + + + + + + UPDATE basic_third_sys + + thirdId=#{thirdId}, + thirdName=#{thirdName}, + piQueryUrl=#{piQueryUrl}, + piQueryEnabled=#{piQueryEnabled}, + orderQueryUrl=#{orderQueryUrl}, + orderQueryEnabled=#{orderQueryEnabled}, + orderAddUrl=#{orderAddUrl}, + orderAddEnabled=#{orderAddEnabled}, + orderDeleteUrl=#{orderDeleteUrl}, + orderDeleteEnabled=#{orderDeleteEnabled}, + orderModifyUrl=#{orderModifyUrl}, + orderModifyEnabled=#{orderModifyEnabled}, + invPiUrl=#{invPiUrl}, + invPiEnabled=#{invPiEnabled}, + corpUrl=#{corpUrl}, + corpEnabled=#{corpEnabled}, + remark=#{remark}, + enabled=#{enabled}, + + WHERE id=#{id} + + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml index 7e52c3a6..8d7aa77a 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml @@ -8,7 +8,7 @@ SELECT * FROM basic_corp - and name like concat('%',#{key},'%') or spell like concat('%',#{key},'%') or erpId like + and name like concat('%',#{key},'%') or spell like concat('%',#{key},'%') or erpId like concat('%',#{key},'%') @@ -22,7 +22,7 @@ parameterType="com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity"> INSERT INTO basic_corp (thirdId,erpId,name,spell, - addr,status,type,creditNo,contact,mobile) + addr,status,type,creditNo,contact,mobile,thirdId1,thirdId2,thirdId3,thirdId4) values ( #{thirdId}, @@ -34,32 +34,14 @@ #{type}, #{creditNo}, #{contact}, - #{mobile} + #{mobile},#{thirdId1},#{thirdId2},#{thirdId3},#{thirdId4} ) - - insert INTO basic_corp( - thirdId,erpId,name,spell,addr, - status,type,creditNo,contact,mobile - ) values - ( - #{thirdId}, - #{erpId}, - #{name}, - #{spell}, - #{addr}, - #{status}, - #{type}, - #{creditNo}, - #{contact}, - #{mobile} - ) - UPDATE basic_corp - + thirdId=#{thirdId}, erpId=#{erpId}, name=#{name}, @@ -70,7 +52,11 @@ creditNo=#{creditNo}, contact=#{contact}, mobile=#{mobile}, - + thirdId1=#{thirdId1}, + thirdId2=#{thirdId2}, + thirdId3=#{thirdId3}, + thirdId4=#{thirdId4}, + WHERE id=#{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml index cb8b72b1..4ce3dd82 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml @@ -16,8 +16,28 @@ AND action LIKE concat(#{mainAction},'%') - - AND enable =#{enable} + + AND enable =#{enabled} + + + + + + + SELECT * FROM thr_corp + + + AND unitId = #{unitId} + + + AND name = #{name} + + + AND thirdSysFk = #{thirdSysFk} + + + + + + + + replace INTO thr_corp + ( + unitId,name,spell,addr,creditNo, + contact,mobile,thirdSysFk + ) + values + ( + #{unitId}, + #{name}, + #{spell}, + #{addr}, + #{creditNo}, + #{contact}, + #{mobile}, + #{thirdSysFk} + ) + + + + replace INTO thr_corp + ( + unitId,name,spell,addr,creditNo, + contact,mobile,thirdSysFk + ) + values + + + ( + #{item.unitId}, + #{item.name}, + #{item.spell}, + #{item.addr}, + #{item.creditNo}, + #{item.contact}, + #{item.mobile}, + #{item.thirdSysFk} + ) + + + + + DELETE FROM thr_corp WHERE id = #{id} + + + + UPDATE thr_corp + + unitId=#{unitId}, + name=#{name}, + spell=#{spell}, + addr=#{addr}, + creditNo=#{creditNo}, + contact=#{contact}, + mobile=#{mobile}, + thirdSysFk=#{thirdSysFk}, + + WHERE id = #{id} + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml new file mode 100644 index 00000000..9bd0e598 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml @@ -0,0 +1,83 @@ + + + + + + + + + + replace INTO thr_inv_products + ( + inventoryCode,inventoryName,count,spec, + warehouseName,warehouseCode,registerCertNo,manufacturingDate, + expirationDate,thirdSysFk + ) + values + ( + #{inventoryCode}, #{inventoryName}, #{count}, #{spec}, + #{warehouseName}, #{warehouseCode}, #{registerCertNo}, #{manufacturingDate}, + #{expirationDate}, + #{thirdSysFk} + ) + + + + replace INTO thr_inv_products + ( + inventoryCode,inventoryName,count,spec, + warehouseName,warehouseCode,registerCertNo,manufacturingDate, + expirationDate,thirdSysFk + ) + values + + + ( + #{item.inventoryCode}, #{item.inventoryName}, #{item.count}, #{item.spec}, + #{item.warehouseName}, #{item.warehouseCode}, #{item.registerCertNo}, + #{item.manufacturingDate}, #{item.expirationDate}, + #{item.thirdSysFk} + ) + + + + + DELETE FROM thr_inv_products WHERE id = #{id} + + + + UPDATE thr_inv_products + + inventoryCode=#{inventoryCode}, + inventoryName=#{inventoryName}, + spec=#{spec}, + count=#{count}, + batchNo=#{batchNo}, + warehouseName=#{warehouseName}, + warehouseCode=#{warehouseCode}, + registerCertNo=#{registerCertNo}, + manufacturingDate=#{manufacturingDate}, + expirationDate=#{expirationDate}, + thirdSysFk=#{thirdSysFk}, + + WHERE id = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml new file mode 100644 index 00000000..10f13e86 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml @@ -0,0 +1,81 @@ + + + + + + + + + + replace INTO thr_order + ( + billNo,billdate,corpId,corpName,billType,billFlag,thirdSysFk + ) + values + ( + #{billNo}, + #{billdate}, + #{corpId}, + #{corpName}, + #{billType}, + #{billFlag}, + #{thirdSysFk} + ) + + + + replace INTO thr_order + ( + billNo,billdate,corpId,corpName,billType,billFlag,thirdSysFk + ) + values + + + ( + #{item.billNo}, + #{item.billdate}, + #{item.corpId}, + #{item.corpName}, + #{item.billType}, + #{item.billFlag}, + #{item.thirdSysFk} + ) + + + + + DELETE FROM thr_order WHERE id = #{id} + + + + UPDATE thr_order + + billNo=#{billNo}, + billdate=#{billdate}, + corpId=#{corpId}, + corpName=#{corpName}, + billType=#{billType}, + billFlag=#{billFlag}, + thirdSysFk=#{thirdSysFk}, + + WHERE id = #{id} + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml new file mode 100644 index 00000000..0716d68b --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml @@ -0,0 +1,74 @@ + + + + + + + + + + replace INTO thr_order_detail + ( + productId,productName,spec,batchNo,expireDate, + productDate,count,reCount,orderIdFk,thirdSysFk + ) + values + ( + #{productId},#{productName},#{spec},#{batchNo},#{expireDate}, + #{productDate},#{count},#{reCount},#{orderIdFk},#{thirdSysFk} + ) + + + + replace INTO thr_order_detail + ( + productId,productName,spec,batchNo,expireDate, + productDate,count,reCount,orderIdFk,thirdSysFk + ) + values + + + ( + #{item.productId},#{item.productName},#{item.spec},#{item.batchNo},#{item.expireDate}, + #{item.productDate},#{item.count},#{item.reCount},#{item.orderIdFk},#{item.thirdSysFk} + ) + + + + + DELETE FROM thr_order_detail WHERE id = #{id} + + + + UPDATE thr_order_detail + + productId=#{productId}, + productName=#{productName}, + spec=#{spec}, + batchNo=#{batchNo}, + expireDate=#{expireDate}, + productDate=#{productDate}, + count=#{count}, + reCount=#{reCount}, + orderIdFk=#{orderIdFk}, + thirdSysFk=#{thirdSysFk}, + + WHERE id = #{id} + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml new file mode 100644 index 00000000..004d64be --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml @@ -0,0 +1,78 @@ + + + + + + + + + + replace INTO thr_products + ( + code,name,measname,spec,registerNo,manufactory,thirdSysFk + ) + values + ( + #{code}, + #{name}, + #{measname}, + #{spec}, + #{registerNo}, + #{manufactory}, + #{thirdSysFk} + ) + + + + replace INTO thr_products + ( + code,name,measname,spec,registerNo,manufactory,thirdSysFk + ) + values + + + ( + #{item.code}, + #{item.name}, + #{item.measname}, + #{item.spec}, + #{item.registerNo}, + #{item.manufactory}, + #{item.thirdSysFk} + ) + + + + + DELETE FROM thr_products WHERE id = #{id} + + + + UPDATE thr_products + + code=#{code}, + name=#{name}, + measname=#{measname}, + spec=#{spec}, + registerNo=#{registerNo}, + manufactory=#{manufactory}, + thirdSysFk=#{thirdSysFk}, + + WHERE id = #{id} + + + + \ No newline at end of file diff --git a/api-admin/src/test/java/com/glxp/api/admin/util/JwtUtilsTest.java b/api-admin/src/test/java/com/glxp/api/admin/util/JwtUtilsTest.java index 1b8660b3..95b23109 100644 --- a/api-admin/src/test/java/com/glxp/api/admin/util/JwtUtilsTest.java +++ b/api-admin/src/test/java/com/glxp/api/admin/util/JwtUtilsTest.java @@ -62,4 +62,6 @@ public class JwtUtilsTest extends BaseApiAdminApplicationTest { String[] datas = data.split(","); System.out.println(datas[0]); } + + }