代码备份

master
anthonywj 4 years ago
parent a3256cda2a
commit 07d04c4101

@ -79,7 +79,6 @@
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.oracle</groupId>
<artifactId>ojdbc6</artifactId>
@ -157,6 +156,10 @@
<artifactId>pagehelper-spring-boot-autoconfigure</artifactId>
<version>1.2.5</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
</dependency>
</dependencies>
<build>

@ -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();
}
}

@ -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<WebSocketServer> webSocketSet = new CopyOnWriteArraySet<WebSocketServer>();
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<WebSocketServer> getWebSocketSet() {
return webSocketSet;
}
}

@ -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<BasicThirdSysEntity> basicThirdSysEntities;
basicThirdSysEntities = basicThirdSysService.filterBasicThiSys(filterBasicThirdSysRequest);
PageInfo<BasicThirdSysEntity> pageInfo;
pageInfo = new PageInfo<>(basicThirdSysEntities);
PageSimpleResponse<BasicThirdSysEntity> 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("更新成功");
}
}

@ -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<String, Object> 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<ErpUnitsResponse> custmandocResponses = combineRequest.getCustmandocResponses();
if (custmandocResponses != null && custmandocResponses.size() > 0) {
for (ErpUnitsResponse custmandocResponse : custmandocResponses) {
List<ErpUnitsResponse> 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<PageSimpleResponse<ErpUnitsResponse>> udiDlDeviceResponse =
new ErpBasicClient().getErpCrop(unitMaintainFilterRequest, systemParamConfigEntityBUMErpQuery.getParamValue());
new ErpBasicClient().getErpCrop(unitMaintainFilterRequest, basicThirdSysEntity.getCorpUrl());
return udiDlDeviceResponse;
}
}

@ -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<BussinessTypResponse> bussinessTypeEntities;
bussinessTypeEntities = bussinessTypeService.filterJoinList(bussinessTypeFilterRequest);
PageInfo<BussinessTypResponse> pageInfo;
pageInfo = new PageInfo<>(bussinessTypeEntities);
PageSimpleResponse<BussinessTypResponse> 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) {

@ -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<PageSimpleResponse<ErpProductsResponse>> udiDlDeviceResponse = erpBasicHttpClient.getErpProducts(filterErpGoodsRequest, systemParamConfigEntity.getParamValue());
BaseResponse<PageSimpleResponse<ErpProductsResponse>> udiDlDeviceResponse = erpBasicHttpClient.getErpProducts(filterErpGoodsRequest, basicThirdSysEntity.getPiQueryUrl());
if (udiDlDeviceResponse.getCode() == 20000) {
List<ErpProductsResponse> 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;

@ -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<String> ids = combineRequest.getKeys();
if (ids != null && ids.size() > 0) {
List<UdiRelevanceResponse> udiRelevanceResponses = new ArrayList<>();
List<PostSmpUdiInfoRequest> postSmpUdiInfoRequests = new ArrayList<>();
for (int i = 0; i < ids.size(); i++) {
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
filterUdiInfoRequest.setId(ids.get(i));
@ -275,8 +279,146 @@ public class UdiRelevanceController {
}
}
//接收供应商或第三方服务上传产品信息
@PostMapping("/udiwms/udirl/thirdSys/upload")
public BaseResponse uploadThirdServcie(@RequestBody PostThirdSysPiRequest postThirdSysPiRequest) {
List<PostSmpUdiInfoRequest> 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<BasicThirdSysEntity> basicThirdSysEntities = basicThirdSysService.filterBasicThiSys(filterBasicThirdSysRequest);
List<BasicProductThirdSysResponse> 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<BasicProductThirdSysResponse> pageInfo;
pageInfo = new PageInfo<>(basicProductThirdSysResponses);
PageSimpleResponse<BasicProductThirdSysResponse> 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<BasicThirdSysEntity> basicThirdSysEntities) {
if (basicThirdSysEntities != null && basicThirdSysEntities.size() > 0) {
for (BasicThirdSysEntity basicThirdSysEntity : basicThirdSysEntities) {
if (thirdId.equals(basicThirdSysEntity.getThirdId())) {
return basicThirdSysEntity;
}
}
}
return null;
}
}

@ -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,16 +166,14 @@ public class OrderController {
}
List<String> orderList = orderMergeRequest.getOrderList();
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("forbidSameErp");
if (systemParamConfigEntity == null || systemParamConfigEntity.getParamValue().equals("0")) {
List<ErpOrderEntity> mergeList = new ArrayList<>();
List<OrderEntity> mergeList = new ArrayList<>();
if (orderList != null && orderList.size() > 1) {
for (String orderId : orderList) {
FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();
filterErpOrderRequest.setOrderId(orderId);
List<ErpOrderEntity> erpOrderEntities = myErpOrderService.filterAllMyErpOrder(filterErpOrderRequest);
if (erpOrderEntities != null && erpOrderEntities.size() > 0) {
mergeList.addAll(erpOrderEntities);
OrderEntity orderEntity = orderService.findById(orderId);
if (orderEntity != null) {
mergeList.add(orderEntity);
}
myErpOrderService.deleteByOrderId(orderId);
@ -191,62 +194,59 @@ public class OrderController {
}
mainOrderEntity.setErpFk(docidStr);
orderService.updateOrder(mainOrderEntity);
SystemParamConfigEntity erpEntity = systemParamConfigService.selectByParamKey("erp_order_query");
if (erpEntity == null) {
if (docidStr.length() > 0) {
BussinessTypResponse bussinessTypResponse = bussinessTypeService.findJoinBTByAction(mainOrderEntity.getAction());
if (bussinessTypResponse.getOrderQueryUrl() == null) {
return ResultVOUtils.error(500, "ERP出入库单据查询接口地址未定义");
}
List<ErpOrderEntity> erpOrderEntities = new ErpOrderClient(erpEntity.getParamValue()).getErpOrder(docids, mainOrderEntity.getAction());
List<ErpOrderEntity> erpOrderEntities = new ErpOrderClient(bussinessTypResponse.getOrderQueryUrl()).getErpOrder(docids, mainOrderEntity.getAction());
if (erpOrderEntities != null && erpOrderEntities.size() > 0) {
List<ErpOrderEntity> returnOrders = new ContrastErpUtil().transErp(erpOrderEntities, udiRelevanceService, mainOrder);
myErpOrderService.insertErpOrders(returnOrders);
List<WarehouseEntity> 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单失败");
}
} else {
return ResultVOUtils.error(ResultEnum.DATA_ERROR);
mainOrderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL);
mainOrderEntity.setRemark("获取ERP单失败");
orderService.updateOrder(mainOrderEntity);
List<WarehouseEntity> datas = warehouseService.findByReceiptId(mainOrder);
new InoutUtils().generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, datas);
return ResultVOUtils.error(500, "获取ERP单失败");
}
} else {
if (orderList != null && orderList.size() > 1) {
for (String orderId : orderList) {
FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();
filterErpOrderRequest.setOrderId(orderId);
List<ErpOrderEntity> 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<WarehouseEntity> datas = warehouseService.findByReceiptId(mainOrder);
new InoutUtils().generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, datas);
}).start();
}
} else {
return ResultVOUtils.error(ResultEnum.DATA_ERROR);
}
return ResultVOUtils.success("合并成功,后台正在数据转换,请稍后刷新重试!");
}
public List<String> getDocids(List<ErpOrderEntity> mergeList) {
public List<String> getDocids(List<OrderEntity> mergeList) {
List<String> docids = new ArrayList<>();
Map<String, List<ErpOrderEntity>> 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]);
}
}
}
}
if (docids.size() > 1) {
return new ArrayList<>(new TreeSet<>(docids));
} else
return docids;
}

@ -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<String, List<ErpOrderEntity>> listMap = erpOrderEntities.stream().collect(Collectors.groupingBy(ErpOrderEntity::getErpOrderId));
BaseResponse baseResponse = new ErpOrderClient().postBill(listMap, orderEntity.getAction(), url);
if (baseResponse != null && baseResponse.getCode() == 20000) {

@ -133,6 +133,7 @@ public class WareHouseController {
}
transInoutService.repeatCommit(commitRequest);
return ResultVOUtils.success("提交成功,后台已开启重码校验,请稍后刷新查看!");
}
}

@ -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<PageSimpleResponse<ErpOnHandResponse>> responseBaseResponse = new ErpInvClient().getOnHandResponse(onhandQueryRequest, onHandUrl);
onHandUrl = basicThirdSysEntity.getInvPiUrl();
BaseResponse<PageSimpleResponse<ErpInvProductResponse>> responseBaseResponse = new ErpInvClient().getInvPrdoductResponse(onhandQueryRequest, onHandUrl);
return responseBaseResponse;
}

@ -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<StockPrintEntity> stockPrintEntities
= stockPrintService.filterStockPrint(stockprintRequest);
if (stockPrintEntities != null) {
for (StockPrintEntity stockPrintEntity : stockPrintEntities) {
ErpOnhandRequest erpOnhandRequest = new ErpOnhandRequest();
erpOnhandRequest.setInventoryCode(stockPrintEntity.getThirdId());
List<ErpOnHandResponse> erpOnHandResponses = new ErpInvClient().getOnHand(erpOnhandRequest, onHandUrl);
List<ErpInvProductResponse> 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();

@ -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<ThrCorpEntity> thrCorpEntities
= thrCorpService.filterThrCorps(filterThrCorpRequest);
PageInfo<ThrCorpEntity> pageInfo;
pageInfo = new PageInfo<>(thrCorpEntities);
PageSimpleResponse<ThrCorpEntity> 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<ThrCorpEntity> thrCorpEntities;
List<ErpUnitsResponse> 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, "上传数据为空");
}
}

@ -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<ThrInvProductsEntity> thrInvProductsEntities
= thrInvProductsService.filterThrInvProductss(filterThrInvProductsRequest);
PageInfo<ThrInvProductsEntity> pageInfo;
pageInfo = new PageInfo<>(thrInvProductsEntities);
PageSimpleResponse<ThrInvProductsEntity> 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<ThrInvProductsEntity> thrInvProductsEntities;
List<ErpOnHandResponse> 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, "上传数据为空");
}
}

@ -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<ThrOrderEntity> thrOrderEntities
= thrOrderService.filterThrOrder(filterThrOrderRequest);
PageInfo<ThrOrderEntity> pageInfo;
pageInfo = new PageInfo<>(thrOrderEntities);
PageSimpleResponse<ThrOrderEntity> 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<ThrOrderDetailEntity> thrOrderDetailEntities
= thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest);
PageInfo<ThrOrderDetailEntity> pageInfo;
pageInfo = new PageInfo<>(thrOrderDetailEntities);
PageSimpleResponse<ThrOrderDetailEntity> 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<ThrOrderEntity> thrOrderEntities;
List<ErpOrderResponse> 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<ErpOrderResponse.SubErpOrder> subErpOrders = item.getSubErpOrders();
if (subErpOrders != null && subErpOrders.size() > 0) {
List<ThrOrderDetailEntity> 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, "上传数据为空");
}
}

@ -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<ThrProductsEntity> thrCorpEntities
= thrProductsService.filterThrProductsRequest(filterThrProductsRequest);
PageInfo<ThrProductsEntity> pageInfo;
pageInfo = new PageInfo<>(thrCorpEntities);
PageSimpleResponse<ThrProductsEntity> 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<ThrProductsEntity> thrProductsEntities;
List<ErpProductsResponse> 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, "上传数据为空");
}
}

@ -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<BasicThirdSysEntity> filterBasicThiSys(FilterBasicThirdSysRequest filterBasicThirdSysRequest);
}

@ -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);

@ -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<BussinessTypeEntity> filterList(BussinessTypeFilterRequest bussinessTypeFilterRequest);
List<BussinessTypResponse> filterJoinList(BussinessTypeFilterRequest bussinessTypeFilterRequest);
boolean insertBussinessType(BussinessTypeEntity bussinessTypeEntity);
boolean updateBussinessType(BussinessTypeEntity bussinessTypeEntity);

@ -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<ThrCorpEntity> filterThrCorps(FilterThrCorpRequest filterThrCorpRequest);
boolean insertThrCorps(ThrCorpEntity thrCorpEntity);
boolean insertThrCorpss(@Param("thrCorpEntitys") List<ThrCorpEntity> thrCorpEntitys);
boolean updateThrCorps(ThrCorpEntity thrCorpEntity);
boolean deleteById(@Param("id") String id);
}

@ -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<ThrInvProductsEntity> filterThrInvProductss(FilterThrInvProductsRequest filterThrInvProductsRequest);
boolean insertThrInvProduct(ThrInvProductsEntity thrInvProductsEntity);
boolean insertThrInvProducts(@Param("thrInvProductsEntities") List<ThrInvProductsEntity> thrInvProductsEntities);
boolean updateThrInvProducts(ThrInvProductsEntity thrInvProductsEntity);
boolean deleteById(@Param("id") String id);
}

@ -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<ThrOrderEntity> filterThrOrder(FilterThrOrderRequest filterThrOrderRequest);
boolean insertThrOrder(ThrOrderEntity thrCorpEntity);
boolean insertThrOrders(@Param("thrOrderEntities") List<ThrOrderEntity> thrOrderEntities);
boolean updateThrOrder(ThrOrderEntity thrOrderEntity);
boolean deleteById(@Param("id") String id);
}

@ -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<ThrOrderDetailEntity> filterThrOrderDetailDetail(FilterThrOrderDetailRequest filterThrOrderDetailRequest);
boolean insertThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity);
boolean insertThrOrderDetails(@Param("thrOrderDetailEntities") List<ThrOrderDetailEntity> thrOrderDetailEntities);
boolean updateThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity);
boolean deleteById(@Param("id") String id);
}

@ -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<ThrProductsEntity> filterThrProductsRequest(FilterThrProductsRequest filterThrProductsRequest);
boolean insertThrProducts(ThrProductsEntity thrProductsEntity);
boolean insertThrProductss(@Param("thrProductsEntities") List<ThrProductsEntity> thrProductsEntities);
boolean updateThrProducts(ThrProductsEntity thrProductsEntity);
boolean deleteById(@Param("id") String id);
}

@ -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;
}

@ -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;
}

@ -10,5 +10,6 @@ public class BussinessTypeEntity {
private Boolean enable;
private String remark;
private String mainAction;
private String thirdSysFk;
}

@ -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;
}

@ -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;
}
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -23,8 +23,7 @@ public class ErpBasicClient {
//获取往来单位
public BaseResponse<PageSimpleResponse<ErpUnitsResponse>> getErpCrop(UnitMaintainFilterRequest unitMaintainFilterRequest, String url) {
Map<String, Object> 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);

@ -117,9 +117,6 @@ public class ErpOrderClient {
filterOrderRequest.setBillAction(action);
filterOrderRequest.setBillNo(billCode);
List<ErpOrderEntity> 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<BaseResponse>() {
});
return baseResponse;
}
public BaseResponse signBill(USignRequest signRequest, String url) {
String response = HttpClient.uCloudPost(url, signRequest);
BaseResponse baseResponse =

@ -11,5 +11,6 @@ public class CombineRequest {
private String thirdId;
private String erpName;
private String relId;
private String thirdSys;
}

@ -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;
}

@ -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;
}

@ -8,5 +8,6 @@ public class FilterErpGoodsRequest extends ListPageRequest {
private String name;
private String code;
private String thirdSys;
}

@ -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;
}

@ -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<PostSmpUdiInfoRequest> datas;
}

@ -8,7 +8,8 @@ import java.util.Map;
@Data
public class ERPPostBillRequest {
private String billNo;
private String billAction;
private String modifyType;
private Map<String, List<ErpOrderEntity>> postMap;
}

@ -11,7 +11,7 @@ public class ErpOnhandRequest {
private String warehouseCode;
private String inventoryCode;
private List<String> inventoryCodes;
private String udiCode;
private String nameCode;
private String thirdSys;
}

@ -9,6 +9,6 @@ public class BussinessTypeFilterRequest extends ListPageRequest {
private String action;
private String name;
private String mainAction;
private Boolean enable;
private Boolean enabled;
}

@ -9,6 +9,6 @@ import java.util.List;
public class CombineUnitRequest {
List<String> keys;
private String thirdId;
private String thirdSys;
List<ErpUnitsResponse> custmandocResponses;
}

@ -9,4 +9,5 @@ public class UnitMaintainFilterRequest extends ListPageRequest {
private String key;
private String unitId;
private String name;
private String thirdSys;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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<ErpUnitsResponse> corps;
}

@ -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<ErpOnHandResponse> datas;
}

@ -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<ErpOrderResponse> datas;
}

@ -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<ErpProductsResponse> datas;
}

@ -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;
}

@ -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;
}

@ -15,5 +15,6 @@ public class ErpProductsResponse {
//辅助字段
private boolean isChecked;
private String thirdSys;
}

@ -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;
}

@ -9,7 +9,7 @@ public class ErpOrderResponse {
private String corpId;
private String corpName;
private String billType;
private boolean signFlag;
private String billFlag;
private List<ErpOrderResponse.SubErpOrder> 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<SubErpOrder> 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;

@ -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;
}

@ -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<BasicThirdSysEntity> filterBasicThiSys(FilterBasicThirdSysRequest filterBasicThirdSysRequest);
}

@ -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);

@ -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<BussinessTypeEntity> filterList(BussinessTypeFilterRequest bussinessTypeFilterRequest);
List<BussinessTypResponse> filterJoinList(BussinessTypeFilterRequest bussinessTypeFilterRequest);
BussinessTypeEntity findBTByAction(String action);
BussinessTypeEntity findBTByName(String action);
BussinessTypeEntity findBTByName(String name);
BussinessTypResponse findJoinBTByAction(String action);
boolean insertBussinessType(BussinessTypeEntity bussinessTypeEntity);

@ -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<BasicThirdSysEntity> 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<BasicThirdSysEntity> data = basicThirdSysDao.filterBasicThiSys(filterBasicThirdSysRequest);
return data;
}
}

@ -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);
}

@ -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<BussinessTypResponse> 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<BussinessTypResponse> 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<BussinessTypResponse> 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);

@ -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<ThrCorpEntity> filterThrCorps(FilterThrCorpRequest filterThrCorpRequest);
boolean insertThrCorps(ThrCorpEntity thrCorpEntity);
boolean insertThrCorpss(List<ThrCorpEntity> thrCorpEntitys);
boolean updateThrCorps(ThrCorpEntity thrCorpEntity);
boolean deleteById(String id);
}

@ -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<ThrInvProductsEntity> filterThrInvProductss(FilterThrInvProductsRequest filterThrInvProductsRequest);
boolean insertThrInvProduct(ThrInvProductsEntity thrInvProductsEntity);
boolean insertThrInvProducts(List<ThrInvProductsEntity> thrInvProductsEntities);
boolean updateThrInvProducts(ThrInvProductsEntity thrInvProductsEntity);
boolean deleteById(String id);
}

@ -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<ThrOrderDetailEntity> filterThrOrderDetailDetail(FilterThrOrderDetailRequest filterThrOrderDetailRequest);
boolean insertThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity);
boolean insertThrOrderDetails(List<ThrOrderDetailEntity> thrOrderDetailEntities);
boolean updateThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity);
boolean deleteById(String id);
}

@ -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<ThrOrderEntity> filterThrOrder(FilterThrOrderRequest filterThrOrderRequest);
ThrOrderEntity findByUnique(String billNo, String thirdSysFk);
boolean insertThrOrder(ThrOrderEntity thrCorpEntity);
boolean insertThrOrders(List<ThrOrderEntity> thrOrderEntities);
boolean updateThrOrder(ThrOrderEntity thrOrderEntity);
boolean deleteById(String id);
}

@ -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<ThrProductsEntity> filterThrProductsRequest(FilterThrProductsRequest filterThrProductsRequest);
boolean insertThrProducts(ThrProductsEntity thrProductsEntity);
boolean insertThrProductss(List<ThrProductsEntity> thrProductsEntities);
boolean updateThrProducts(ThrProductsEntity thrProductsEntity);
boolean deleteById(String id);
}

@ -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<ThrCorpEntity> 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<ThrCorpEntity> data = thrCorpDao.filterThrCorps(filterThrCorpRequest);
return data;
}
@Override
public boolean insertThrCorps(ThrCorpEntity thrCorpEntity) {
return thrCorpDao.insertThrCorps(thrCorpEntity);
}
@Override
public boolean insertThrCorpss(List<ThrCorpEntity> 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);
}
}

@ -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<ThrInvProductsEntity> 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<ThrInvProductsEntity> data = thrInvProductsDao.filterThrInvProductss(filterThrInvProductsRequest);
return data;
}
@Override
public boolean insertThrInvProduct(ThrInvProductsEntity thrInvProductsEntity) {
return thrInvProductsDao.insertThrInvProduct(thrInvProductsEntity);
}
@Override
public boolean insertThrInvProducts(List<ThrInvProductsEntity> 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);
}
}

@ -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<ThrOrderDetailEntity> 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<ThrOrderDetailEntity> data = thrOrderDetailDao.filterThrOrderDetailDetail(filterThrOrderDetailRequest);
return data;
}
@Override
public boolean insertThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity) {
return thrOrderDetailDao.insertThrOrderDetail(thrOrderDetailEntity);
}
@Override
public boolean insertThrOrderDetails(List<ThrOrderDetailEntity> 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);
}
}

@ -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<ThrOrderEntity> 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<ThrOrderEntity> 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<ThrOrderEntity> 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<ThrOrderEntity> 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);
}
}

@ -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<ThrProductsEntity> 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<ThrProductsEntity> data = thrProductsDao.filterThrProductsRequest(filterThrProductsRequest);
return data;
}
@Override
public boolean insertThrProducts(ThrProductsEntity thrProductsEntity) {
return thrProductsDao.insertThrProducts(thrProductsEntity);
}
@Override
public boolean insertThrProductss(List<ThrProductsEntity> 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);
}
}

@ -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("暂未设置,不更新");
}

@ -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<ErpOnHandResponse> erpOnHandResponses = new ErpInvClient().getOnHand(erpOnhandRequest, onHandUrl);
List<ErpInvProductResponse> erpOnHandResponses = new ErpInvClient().getInvPrdoduct(erpOnhandRequest, onHandUrl);
if (erpOnHandResponses != null) {
Map<String, List<ErpOnHandResponse>> map = erpOnHandResponses.stream().collect(Collectors.groupingBy(ErpOnHandResponse::getInventoryCode));
for (List<ErpOnHandResponse> onHandResponses : map.values()) {
Map<String, List<ErpInvProductResponse>> map = erpOnHandResponses.stream().collect(Collectors.groupingBy(ErpInvProductResponse::getCode));
for (List<ErpInvProductResponse> 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 {

@ -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<ErpOnHandResponse> erpOnHandResponses = new ErpInvClient().getOnHand(erpOnhandRequest, url);
List<ErpInvProductResponse> 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())

@ -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) {
@ -81,10 +86,10 @@ public class IoModifyErpTask implements SchedulingConfigurer {
filterErpOrderRequest.setLimit(100);
filterErpOrderRequest.setOrderId(orderEntity.getId());
List<ErpOrderEntity> 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<String, List<ErpOrderEntity>> 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<OrderEntity> 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) {
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<ErpOrderEntity> erpOrderEntities = myErpOrderService.filterMyErpOrder(filterErpOrderRequest);
if (erpOrderEntities != null && !erpOrderEntities.isEmpty()) {
Map<String, List<ErpOrderEntity>> 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单据签字接口地址未定义");
logger.error("ERP单据修改接口地址未定义");
}
}
}
}

@ -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<WarehouseEntity> 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,14 +185,14 @@ public class IoTransInoutService {
List<String> erpIds = DataTransUtil.strToErpList(orderEntity.getErpFk());
List<WarehouseEntity> 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();
String erpOrderUrl = bussinessTypResponse.getOrderQueryUrl();
List<ErpOrderEntity> cloudErps = new ErpOrderClient(erpOrderUrl).getErpOrder(erpIds, orderEntity.getAction());
if (cloudErps != null && cloudErps.size() > 0) {
List<ErpOrderEntity> returnOrders = new ContrastErpUtil().transErp(cloudErps, udiRelevanceService, orderEntity.getId());
@ -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);
}

@ -0,0 +1,50 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.api.admin.dao.basic.BasicThirdSysDao">
<update id="updateBasicThiSys" parameterType="com.glxp.api.admin.entity.basic.BasicThirdSysEntity">
UPDATE basic_third_sys
<set>
<if test="thirdId != null">thirdId=#{thirdId},</if>
<if test="thirdName != null">thirdName=#{thirdName},</if>
<if test="piQueryUrl != null">piQueryUrl=#{piQueryUrl},</if>
<if test="piQueryEnabled != null">piQueryEnabled=#{piQueryEnabled},</if>
<if test="orderQueryUrl != null">orderQueryUrl=#{orderQueryUrl},</if>
<if test="orderQueryEnabled != null">orderQueryEnabled=#{orderQueryEnabled},</if>
<if test="orderAddUrl != null">orderAddUrl=#{orderAddUrl},</if>
<if test="orderAddEnabled != null">orderAddEnabled=#{orderAddEnabled},</if>
<if test="orderDeleteUrl != null">orderDeleteUrl=#{orderDeleteUrl},</if>
<if test="orderDeleteEnabled != null">orderDeleteEnabled=#{orderDeleteEnabled},</if>
<if test="orderModifyUrl != null">orderModifyUrl=#{orderModifyUrl},</if>
<if test="orderModifyEnabled != null">orderModifyEnabled=#{orderModifyEnabled},</if>
<if test="invPiUrl != null">invPiUrl=#{invPiUrl},</if>
<if test="invPiEnabled != null">invPiEnabled=#{invPiEnabled},</if>
<if test="corpUrl != null">corpUrl=#{corpUrl},</if>
<if test="corpEnabled != null">corpEnabled=#{corpEnabled},</if>
<if test="remark != null">remark=#{remark},</if>
<if test="enabled != null">enabled=#{enabled},</if>
</set>
WHERE id=#{id}
</update>
<select id="filterBasicThiSys" parameterType="com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest"
resultType="com.glxp.api.admin.entity.basic.BasicThirdSysEntity">
SELECT * FROM basic_third_sys
<where>
<if test="thirdId != '' and thirdId != null">
AND thirdId = #{thirdId}
</if>
<if test="thirdName != '' and thirdName != null">
AND thirdName = #{thirdName}
</if>
<if test="enabled != '' and enabled != null">
AND enabled = #{enabled}
</if>
</where>
</select>
<select id="selectByThirdId" parameterType="Map" resultType="com.glxp.api.admin.entity.basic.BasicThirdSysEntity">
select * FROM basic_third_sys WHERE thirdId = #{thirdId}
</select>
</mapper>

@ -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>
<insert id="insert" parameterType="com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity">
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}
)
</insert>
<update id="updateById" parameterType="com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity">
UPDATE basic_corp
<set>
<trim prefix="set" suffixOverrides=",">
<if test="thirdId != null">thirdId=#{thirdId},</if>
<if test="erpId != null">erpId=#{erpId},</if>
<if test="name != null">name=#{name},</if>
@ -70,7 +52,11 @@
<if test="creditNo != null">creditNo=#{creditNo},</if>
<if test="contact != null">contact=#{contact},</if>
<if test="mobile != null">mobile=#{mobile},</if>
</set>
<if test="thirdId1 != null">thirdId1=#{thirdId1},</if>
<if test="thirdId2 != null">thirdId2=#{thirdId2},</if>
<if test="thirdId3 != null">thirdId3=#{thirdId3},</if>
<if test="thirdId4 != null">thirdId4=#{thirdId4},</if>
</trim>
WHERE id=#{id}
</update>

@ -16,8 +16,28 @@
<if test="mainAction != ''and mainAction != null">
AND action LIKE concat(#{mainAction},'%')
</if>
<if test="enable != ''and enable != null">
AND enable =#{enable}
<if test="enabled != ''and enabled != null">
AND enable =#{enabled}
</if>
</where>
</select>
<select id="filterJoinList" parameterType="com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest"
resultType="com.glxp.api.admin.res.basic.BussinessTypResponse">
select * from basic_bussiness_type LEFT JOIN basic_third_sys on basic_bussiness_type.thirdSysFk = basic_third_sys.thirdId
<where>
<if test="name != ''and name != null">
AND name LIKE concat(#{name},'%')
</if>
<if test="action != ''and action != null">
AND action LIKE concat(#{action},'%')
</if>
<if test="mainAction != ''and mainAction != null">
AND action LIKE concat(#{mainAction},'%')
</if>
<if test="enabled != ''and enabled != null">
AND basic_third_sys.enabled =#{enabled}
</if>
</where>
@ -41,11 +61,12 @@
<update id="updateBussinessType" parameterType="com.glxp.api.admin.entity.basic.BussinessTypeEntity">
UPDATE basic_bussiness_type SET
action = #{action},
name = #{name},
enable = #{enable},
remark = #{remark},
mainAction = #{mainAction}
<if test="action != null"> action = #{action},</if>
<if test="name != null">name = #{name},</if>
<if test="enable != null">enable = #{enable},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="mainAction != null">mainAction = #{mainAction},</if>
<if test="thirdSysFk != null">thirdSysFk=#{thirdSysFk}</if>
WHERE id = #{id}
</update>

@ -8,6 +8,9 @@
select
basic_udirel.id,
basic_udirel.thirdId,basic_udirel.thirdName,basic_udirel.isUseDy,
basic_udirel.thirdId1,basic_udirel.thirdId2,basic_udirel.thirdId3,basic_udirel.thirdId4,
basic_udirel.thirdName1,basic_udirel.thirdName2,basic_udirel.thirdName3,basic_udirel.thirdName4,
basic_udirel.ybbm,basic_udirel.sptm,
basic_products.nameCode,basic_products.packRatio,basic_products.packLevel,
basic_products.bhxjsl,basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl,
basic_products.bhxjcpbm,basic_products.bzcj,
@ -49,6 +52,9 @@
select
basic_udirel.id,
basic_udirel.thirdId,basic_udirel.thirdName,basic_udirel.isUseDy,
basic_udirel.thirdId1,basic_udirel.thirdId2,basic_udirel.thirdId3,basic_udirel.thirdId4,
basic_udirel.thirdName1,basic_udirel.thirdName2,basic_udirel.thirdName3,basic_udirel.thirdName4,
basic_udirel.ybbm,basic_udirel.sptm,
basic_products.nameCode,basic_products.packRatio,basic_products.packLevel,basic_products.bhxjsl,basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl,basic_products.bhxjcpbm,basic_products.bzcj,basic_products.addType,basic_products.deviceRecordKey,basic_products.cpmctymc,basic_products.cplb,basic_products.flbm,basic_products.ggxh,basic_products.qxlb,basic_products.tyshxydm,basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,basic_products.ylqxzcrbarywmc,basic_products.sydycpbs,basic_products.uuid,basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType
FROM basic_products
right JOIN basic_udirel
@ -98,7 +104,8 @@
<insert id="insertUdiRelevance" keyProperty="id" parameterType="com.glxp.api.admin.entity.basic.UdiRelevanceEntity">
replace INTO basic_udirel
(
thirdId,thirdName,uuid,isUseDy,updateTime
thirdId,thirdName,uuid,isUseDy,updateTime,
thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,ybbm,sptm
)
values
(
@ -106,8 +113,10 @@
#{thirdName},
#{uuid},
#{isUseDy},
#{updateTime}
#{updateTime},
#{thirdId1}, #{thirdId2}, #{thirdId3}, #{thirdId4},
#{thirdName1}, #{thirdName2}, #{thirdName3}, #{thirdName4},
#{ybbm}, #{sptm}
)
</insert>
@ -132,7 +141,17 @@
<if test="thirdName != null">thirdName=#{thirdName},</if>
<if test="uuid != null">uuid=#{uuid},</if>
<if test="isUseDy != null">isUseDy=#{isUseDy},</if>
<if test="updateTime != null">updateTime=#{updateTime},</if>
<if test="thirdId1 != null">thirdId1=#{thirdId1},</if>
<if test="thirdId2 != null">thirdId2=#{thirdId2},</if>
<if test="thirdId3 != null">thirdId3=#{thirdId3},</if>
<if test="thirdId4 != null">thirdId4=#{thirdId4},</if>
<if test="thirdName1 != null">thirdName1=#{thirdName1},</if>
<if test="thirdName2 != null">thirdName2=#{thirdName2},</if>
<if test="thirdName3 != null">thirdName3=#{thirdName3},</if>
<if test="thirdName4 != null">thirdName4=#{thirdName4},</if>
<if test="ybbm != null">ybbm=#{ybbm},</if>
<if test="sptm != null">sptm=#{sptm},</if>
<if test="updateTime != null">updateTime=#{updateTime}</if>
</set>
WHERE id = #{id}
</update>

@ -0,0 +1,86 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.api.admin.dao.thrsys.ThrCorpDao">
<select id="filterThrCorps" parameterType="com.glxp.api.admin.req.thrsys.FilterThrCorpRequest"
resultType="com.glxp.api.admin.entity.thrsys.ThrCorpEntity">
SELECT * FROM thr_corp
<where>
<if test="unitId != '' and unitId != null">
AND unitId = #{unitId}
</if>
<if test="name != '' and name != null">
AND name = #{name}
</if>
<if test="thirdSysFk != '' and thirdSysFk != null">
AND thirdSysFk = #{thirdSysFk}
</if>
</where>
</select>
<insert id="insertThrCorps" keyProperty="id" parameterType="com.glxp.api.admin.entity.thrsys.ThrCorpEntity">
replace INTO thr_corp
(
unitId,name,spell,addr,creditNo,
contact,mobile,thirdSysFk
)
values
(
#{unitId},
#{name},
#{spell},
#{addr},
#{creditNo},
#{contact},
#{mobile},
#{thirdSysFk}
)
</insert>
<insert id="insertThrCorpss" keyProperty="id" parameterType="java.util.List">
replace INTO thr_corp
(
unitId,name,spell,addr,creditNo,
contact,mobile,thirdSysFk
)
values
<foreach collection="thrCorpEntitys" item="item" index="index"
separator=",">
(
#{item.unitId},
#{item.name},
#{item.spell},
#{item.addr},
#{item.creditNo},
#{item.contact},
#{item.mobile},
#{item.thirdSysFk}
)
</foreach>
</insert>
<delete id="deleteById" parameterType="Map">
DELETE FROM thr_corp WHERE id = #{id}
</delete>
<update id="updateThrCorps" parameterType="com.glxp.api.admin.entity.thrsys.ThrCorpEntity">
UPDATE thr_corp
<trim prefix="set" suffixOverrides=",">
<if test="unitId != null">unitId=#{unitId},</if>
<if test="name != null">name=#{name},</if>
<if test="spell != null">spell=#{spell},</if>
<if test="addr != null">addr=#{addr},</if>
<if test="creditNo != null">creditNo=#{creditNo},</if>
<if test="contact != null">contact=#{contact},</if>
<if test="mobile != null">mobile=#{mobile},</if>
<if test="thirdSysFk != null">thirdSysFk=#{thirdSysFk},</if>
</trim>
WHERE id = #{id}
</update>
</mapper>

@ -0,0 +1,83 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.api.admin.dao.thrsys.ThrInvProductsDao">
<select id="filterThrInvProductss" parameterType="com.glxp.api.admin.req.thrsys.FilterThrInvProductsRequest"
resultType="com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity">
SELECT * FROM thr_inv_products
<where>
<if test="inventoryCode != '' and inventoryCode != null">
AND inventoryCode = #{inventoryCode}
</if>
<if test="inventoryName != '' and inventoryName != null">
AND inventoryName = #{inventoryName}
</if>
<if test="thirdSysFk != '' and thirdSysFk != null">
AND thirdSysFk = #{thirdSysFk}
</if>
</where>
</select>
<insert id="insertThrInvProduct" keyProperty="id"
parameterType="com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity">
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}
)
</insert>
<insert id="insertThrInvProducts" keyProperty="id" parameterType="java.util.List">
replace INTO thr_inv_products
(
inventoryCode,inventoryName,count,spec,
warehouseName,warehouseCode,registerCertNo,manufacturingDate,
expirationDate,thirdSysFk
)
values
<foreach collection="thrInvProductsEntities" item="item" index="index"
separator=",">
(
#{item.inventoryCode}, #{item.inventoryName}, #{item.count}, #{item.spec},
#{item.warehouseName}, #{item.warehouseCode}, #{item.registerCertNo},
#{item.manufacturingDate}, #{item.expirationDate},
#{item.thirdSysFk}
)
</foreach>
</insert>
<delete id="deleteById" parameterType="Map">
DELETE FROM thr_inv_products WHERE id = #{id}
</delete>
<update id="updateThrInvProducts" parameterType="com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity">
UPDATE thr_inv_products
<trim prefix="set" suffixOverrides=",">
<if test="inventoryCode != null">inventoryCode=#{inventoryCode},</if>
<if test="inventoryName != null">inventoryName=#{inventoryName},</if>
<if test="spec != null">spec=#{spec},</if>
<if test="count != null">count=#{count},</if>
<if test="batchNo != null">batchNo=#{batchNo},</if>
<if test="warehouseName != null">warehouseName=#{warehouseName},</if>
<if test="warehouseCode != null">warehouseCode=#{warehouseCode},</if>
<if test="registerCertNo != null">registerCertNo=#{registerCertNo},</if>
<if test="manufacturingDate != null">manufacturingDate=#{manufacturingDate},</if>
<if test="expirationDate != null">expirationDate=#{expirationDate},</if>
<if test="thirdSysFk != null">thirdSysFk=#{thirdSysFk},</if>
</trim>
WHERE id = #{id}
</update>
</mapper>

@ -0,0 +1,81 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.api.admin.dao.thrsys.ThrOrderDao">
<select id="filterThrOrder" parameterType="com.glxp.api.admin.req.thrsys.FilterThrOrderRequest"
resultType="com.glxp.api.admin.entity.thrsys.ThrOrderEntity">
SELECT * FROM thr_order
<where>
<if test="unitId != '' and unitId != null">
AND unitId = #{unitId}
</if>
<if test="name != '' and name != null">
AND name = #{name}
</if>
<if test="thirdSysFk != '' and thirdSysFk != null">
AND thirdSysFk = #{thirdSysFk}
</if>
</where>
</select>
<insert id="insertThrOrder" keyProperty="id" parameterType="com.glxp.api.admin.entity.thrsys.ThrOrderEntity">
replace INTO thr_order
(
billNo,billdate,corpId,corpName,billType,billFlag,thirdSysFk
)
values
(
#{billNo},
#{billdate},
#{corpId},
#{corpName},
#{billType},
#{billFlag},
#{thirdSysFk}
)
</insert>
<insert id="insertThrOrders" keyProperty="id" parameterType="java.util.List">
replace INTO thr_order
(
billNo,billdate,corpId,corpName,billType,billFlag,thirdSysFk
)
values
<foreach collection="thrOrderEntities" item="item" index="index"
separator=",">
(
#{item.billNo},
#{item.billdate},
#{item.corpId},
#{item.corpName},
#{item.billType},
#{item.billFlag},
#{item.thirdSysFk}
)
</foreach>
</insert>
<delete id="deleteById" parameterType="Map">
DELETE FROM thr_order WHERE id = #{id}
</delete>
<update id="updateThrOrder" parameterType="com.glxp.api.admin.entity.thrsys.ThrOrderEntity">
UPDATE thr_order
<trim prefix="set" suffixOverrides=",">
<if test="billNo != null">billNo=#{billNo},</if>
<if test="billdate != null">billdate=#{billdate},</if>
<if test="corpId != null">corpId=#{corpId},</if>
<if test="corpName != null">corpName=#{corpName},</if>
<if test="billType != null">billType=#{billType},</if>
<if test="billFlag != null">billFlag=#{billFlag},</if>
<if test="thirdSysFk != null">thirdSysFk=#{thirdSysFk},</if>
</trim>
WHERE id = #{id}
</update>
</mapper>

@ -0,0 +1,74 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.api.admin.dao.thrsys.ThrOrderDetailDao">
<select id="filterThrOrderDetailDetail" parameterType="com.glxp.api.admin.req.thrsys.FilterThrOrderDetailRequest"
resultType="com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity">
SELECT * FROM thr_order_detail
<where>
<if test="orderIdFk != '' and orderIdFk != null">
AND orderIdFk = #{orderIdFk}
</if>
<if test="thirdSysFk != '' and thirdSysFk != null">
AND thirdSysFk = #{thirdSysFk}
</if>
</where>
</select>
<insert id="insertThrOrderDetail" keyProperty="id"
parameterType="com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity">
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}
)
</insert>
<insert id="insertThrOrderDetails" keyProperty="id" parameterType="java.util.List">
replace INTO thr_order_detail
(
productId,productName,spec,batchNo,expireDate,
productDate,count,reCount,orderIdFk,thirdSysFk
)
values
<foreach collection="thrOrderDetailEntities" item="item" index="index"
separator=",">
(
#{item.productId},#{item.productName},#{item.spec},#{item.batchNo},#{item.expireDate},
#{item.productDate},#{item.count},#{item.reCount},#{item.orderIdFk},#{item.thirdSysFk}
)
</foreach>
</insert>
<delete id="deleteById" parameterType="Map">
DELETE FROM thr_order_detail WHERE id = #{id}
</delete>
<update id="updateThrOrderDetail" parameterType="com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity">
UPDATE thr_order_detail
<trim prefix="set" suffixOverrides=",">
<if test="productId != null">productId=#{productId},</if>
<if test="productName != null">productName=#{productName},</if>
<if test="spec != null">spec=#{spec},</if>
<if test="batchNo != null">batchNo=#{batchNo},</if>
<if test="expireDate != null">expireDate=#{expireDate},</if>
<if test="productDate != null">productDate=#{productDate},</if>
<if test="count != null">count=#{count},</if>
<if test="reCount != null">reCount=#{reCount},</if>
<if test="orderIdFk != null">orderIdFk=#{orderIdFk},</if>
<if test="thirdSysFk != null">thirdSysFk=#{thirdSysFk},</if>
</trim>
WHERE id = #{id}
</update>
</mapper>

@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.api.admin.dao.thrsys.ThrProductsDao">
<select id="filterThrProductsRequest" parameterType="com.glxp.api.admin.req.thrsys.FilterThrProductsRequest"
resultType="com.glxp.api.admin.entity.thrsys.ThrProductsEntity">
SELECT * FROM thr_products
<where>
<if test="name != '' and name != null">
AND name = #{name}
</if>
<if test="thirdSysFk != '' and thirdSysFk != null">
AND thirdSysFk = #{thirdSysFk}
</if>
</where>
</select>
<insert id="insertThrProducts" keyProperty="id" parameterType="com.glxp.api.admin.entity.thrsys.ThrProductsEntity">
replace INTO thr_products
(
code,name,measname,spec,registerNo,manufactory,thirdSysFk
)
values
(
#{code},
#{name},
#{measname},
#{spec},
#{registerNo},
#{manufactory},
#{thirdSysFk}
)
</insert>
<insert id="insertThrOrders" keyProperty="id" parameterType="java.util.List">
replace INTO thr_products
(
code,name,measname,spec,registerNo,manufactory,thirdSysFk
)
values
<foreach collection="thrProductsEntities" item="item" index="index"
separator=",">
(
#{item.code},
#{item.name},
#{item.measname},
#{item.spec},
#{item.registerNo},
#{item.manufactory},
#{item.thirdSysFk}
)
</foreach>
</insert>
<delete id="deleteById" parameterType="Map">
DELETE FROM thr_products WHERE id = #{id}
</delete>
<update id="updateThrOrder" parameterType="com.glxp.api.admin.entity.thrsys.ThrProductsEntity">
UPDATE thr_products
<trim prefix="set" suffixOverrides=",">
<if test="code != null">code=#{code},</if>
<if test="name != null">name=#{name},</if>
<if test="measname != null">measname=#{measname},</if>
<if test="spec != null">spec=#{spec},</if>
<if test="registerNo != null">registerNo=#{registerNo},</if>
<if test="manufactory != null">manufactory=#{manufactory},</if>
<if test="thirdSysFk != null">thirdSysFk=#{thirdSysFk},</if>
</trim>
WHERE id = #{id}
</update>
</mapper>

@ -62,4 +62,6 @@ public class JwtUtilsTest extends BaseApiAdminApplicationTest {
String[] datas = data.split(",");
System.out.println(datas[0]);
}
}

Loading…
Cancel
Save