UDI
/
udierpsync-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

片仔癀U8系统接口对接bug修改,单据上传日志修改，平和新增序列号字段，单据上传区分批次号和条码清单

Browse Source
master
anthonyywj2 3 years ago
parent ade8a99b8e
commit bcc50930c8
13 changed files with 154 additions and 63 deletions
Show Stats Download Patch File Download Diff File

85
api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/PhxyyClient.java
Unescape Escape View File

@ -1,16 +1,19 @@
package com.glxp.mipsdl.admin.client.http;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.glxp.mipsdl.admin.config.ThirdSysConfig;
import com.glxp.mipsdl.admin.constant.ConstantStatus;
import com.glxp.mipsdl.admin.constant.ConstantType;
import com.glxp.mipsdl.admin.dao.basic.*;
import com.glxp.mipsdl.admin.dao.basic.BasicThirdSysBusApiDao;
import com.glxp.mipsdl.admin.dao.basic.BussinessLocalTypeDao;
import com.glxp.mipsdl.admin.dao.basic.BussinessTypeDao;
import com.glxp.mipsdl.admin.dao.basic.UdiRelevanceDao;
import com.glxp.mipsdl.admin.dao.business.StockOrderDao;
import com.glxp.mipsdl.admin.dao.business.StockOrderDetailDao;
import com.glxp.mipsdl.admin.dao.business.StockOrderUploadLogDao;
import com.glxp.mipsdl.admin.dao.inout.CodesDao;
import com.glxp.mipsdl.admin.dao.inout.OrderDao;
import com.glxp.mipsdl.admin.dao.inventory.InvWarehouseDao;
@ -23,6 +26,7 @@ import com.glxp.mipsdl.admin.entity.business.StockOrderDetailEntity;
import com.glxp.mipsdl.admin.entity.business.StockOrderEntity;
import com.glxp.mipsdl.admin.entity.business.StockOrderUploadLogEntity;
import com.glxp.mipsdl.admin.entity.inout.OrderEntity;
import com.glxp.mipsdl.admin.entity.inout.WarehouseEntity;
import com.glxp.mipsdl.admin.entity.inventory.InvWarehouseEntity;
import com.glxp.mipsdl.admin.entity.phxyy.BasicThirdSysDetailEntity;
import com.glxp.mipsdl.admin.entity.thrsys.ThrCorpEntity;
@ -37,12 +41,14 @@ import com.glxp.mipsdl.admin.req.thrsys.FilterThrInvWarehouseRequest;
import com.glxp.mipsdl.admin.res.phxyy.BussinessOriginTypeResponse;
import com.glxp.mipsdl.admin.service.phxyy.BasicThirdSysBusApiService;
import com.glxp.mipsdl.admin.service.phxyy.BussinessOriginTypeService;
import com.glxp.mipsdl.admin.service.phxyy.StockOrderUploadLogService;
import com.glxp.mipsdl.admin.util.DateUtil;
import com.glxp.mipsdl.admin.util.HttpClient;
import com.glxp.mipsdl.admin.util.SubmitOrderUtils;
import com.glxp.mipsdl.common.res.BaseResponse;
import com.glxp.mipsdl.common.util.ResultVOUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.http.HttpHeaders;
import org.springframework.stereotype.Service;
@ -84,8 +90,6 @@ public class PhxyyClient {
private UdiRelevanceDao udiRelevanceDao;
@Resource
private OrderDao orderDao;
@Resource
private StockOrderUploadLogDao stockOrderUploadLogDao;
@Resource
private BasicThirdSysBusApiService basicThirdSysBusApiService;
@ -96,7 +100,7 @@ public class PhxyyClient {
@Resource
CodesDao codesDao;
@Resource
UnitMaintainDao unitMaintainDao;
StockOrderUploadLogService stockOrderUploadLogService;
public HttpHeaders getHeaders() {
HttpHeaders headers = new HttpHeaders();
@ -296,6 +300,17 @@ public class PhxyyClient {
//组装明细数据
List<UdiwmsOrderDetail> items = new ArrayList<>(stockOrderDetailEntities.size());
StockOrderUploadLogEntity uploadLog = new StockOrderUploadLogEntity();
uploadLog.setBillDate(DateUtil.parseDate(udiwmsOrderRequest.getBillDate()));
uploadLog.setBillType(stockOrderEntity.getBillType());
uploadLog.setSubmitTime(new Date());
uploadLog.setBillNo(udiwmsOrderRequest.getBillNo());
uploadLog.setFromType(ConstantStatus.THIRD_ORDER_UPLOAD);
if (bussinessLocalTypeEntity.getOrderVisibleType() == 1 && (stockOrderEntity.getStatus().equals("4") || stockOrderEntity.getStatus().equals("5"))) {
stockOrderDetailEntities = transferSerList(stockOrderDetailEntities, stockOrderEntity.getOrderIdFk());
}
for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntities) {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceDao.selectById(stockOrderDetailEntity.getRelId());
UdiwmsOrderDetail item = new UdiwmsOrderDetail();
@ -310,29 +325,35 @@ public class PhxyyClient {
item.setStandard(stockOrderDetailEntity.getSpec());
item.setRegisterNo(stockOrderDetailEntity.getZczbhhzbapzbh());
try {
item.setPrice(stockOrderDetailEntity.getPrice());
item.setPrice(stockOrderDetailEntity.getPrice() + "");
item.setFirstSalesInvNo(stockOrderDetailEntity.getFirstSalesInvNo());
item.setSecSalesInvNo(stockOrderDetailEntity.getSecSalesInvNo());
item.setInvoiceDate(stockOrderDetailEntity.getInvoiceDate());
item.setSecSalesListNo(stockOrderDetailEntity.getSecSalesListNo());
ThrProductsEntity thrProductsEntity = submitOrderUtils.toProduct(stockOrderDetailEntity, thirdId);
item.setProductId(thrProductsEntity.getCode());
item.setProductName(thrProductsEntity.getName());
if (StrUtil.isEmpty(thrProductsEntity.getCode())) {
item.setProductId(thrProductsEntity.getCode());
item.setProductName(thrProductsEntity.getName());
uploadLog.setStatus(3);
uploadLog.setResult("提交失败，错误信息：" + "产品DI未关联第三方产品信息");
stockOrderUploadLogService.insertOrUpdate(uploadLog);
return ResultVOUtils.error(500, "提交失败");
}
items.add(item);
} catch (Exception e) {
log.error(e.getMessage(), e);
uploadLog.setStatus(3);
uploadLog.setResult("提交失败，错误信息：" + e.getMessage());
stockOrderUploadLogService.insertOrUpdate(uploadLog);
return ResultVOUtils.error(500, "提交失败");
}
}
udiwmsOrderRequest.setItem(items);
BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("orderSubmitUrl", thirdSysConfig.getThirdSysConfig().getThirdId());
//记录日志
StockOrderUploadLogEntity uploadLog = new StockOrderUploadLogEntity();
uploadLog.setBillDate(DateUtil.parseDate(udiwmsOrderRequest.getBillDate()));
uploadLog.setBillType(stockOrderEntity.getBillType());
uploadLog.setSubmitTime(new Date());
uploadLog.setBillNo(udiwmsOrderRequest.getBillNo());
uploadLog.setFromType(ConstantStatus.THIRD_ORDER_UPLOAD);
String response = httpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + basicThirdSysDetailEntity.getValue(), udiwmsOrderRequest, getHeaderArray());
if (StrUtil.isNotBlank(response)) {
try {
@ -346,29 +367,57 @@ public class PhxyyClient {
uploadLog.setStatus(2);
uploadLog.setThrBillNo(null);
uploadLog.setResult("提交成功");
stockOrderUploadLogDao.insert(uploadLog);
stockOrderUploadLogService.insertOrUpdate(uploadLog);
orderDao.updateOrder(orderEntity);
return ResultVOUtils.success("提交成功");
}
uploadLog.setStatus(3);
uploadLog.setResult("提交失败，错误信息：" + baseResponse.getMessage());
stockOrderUploadLogDao.insert(uploadLog);
stockOrderUploadLogService.insertOrUpdate(uploadLog);
return baseResponse;
} catch (Exception e) {
log.error(e.getMessage(), e);
uploadLog.setStatus(3);
uploadLog.setResult("提交失败，错误信息：" + e.getMessage());
stockOrderUploadLogDao.insert(uploadLog);
stockOrderUploadLogService.insertOrUpdate(uploadLog);
return ResultVOUtils.error(500, "提交失败");
}
} else {
uploadLog.setStatus(3);
uploadLog.setResult("提交失败，调用接口返回为空");
stockOrderUploadLogDao.insert(uploadLog);
stockOrderUploadLogService.insertOrUpdate(uploadLog);
return ResultVOUtils.error(500, "提交失败");
}
}
public List<StockOrderDetailEntity> transferSerList(List<StockOrderDetailEntity> stockOrderDetailEntities, String orderId) {
List<StockOrderDetailEntity> resultList = new ArrayList<>();
List<WarehouseEntity> codeList = codesDao.findByReceiptId(orderId);
if (CollUtil.isNotEmpty(stockOrderDetailEntities)) {
for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntities) {
if (CollUtil.isNotEmpty(codeList)) {
for (WarehouseEntity codeDetaiEntity : codeList) {
if (StrUtil.trimToEmpty(codeDetaiEntity.getRelId()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getRelId()))
&& StrUtil.trimToEmpty(codeDetaiEntity.getBatchNo()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo()))
) {
StockOrderDetailEntity item = new StockOrderDetailEntity();
BeanUtils.copyProperties(stockOrderDetailEntity, item);
// item.setCode(codeDetaiEntity.getCode());
item.setSerialNo(codeDetaiEntity.getSerialNo());
item.setCount(codeDetaiEntity.getCount());
item.setReCount(codeDetaiEntity.getCount());
resultList.add(item);
}
}
}
}
}
return resultList;
}
public BaseResponse getInvProducts(UdiwmsOnhandRequest udiwmsOnhandRequest) {
BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("invPiUrl", thirdSysConfig.getThirdSysConfig().getThirdId());
String response = httpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + basicThirdSysDetailEntity.getValue(), udiwmsOnhandRequest, getHeaderArray());

4
api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/TestClient.java
Unescape Escape View File

@ -330,7 +330,7 @@ public class TestClient {
item.setStandard(stockOrderDetailEntity.getSpec());
item.setRegisterNo(stockOrderDetailEntity.getZczbhhzbapzbh());
item.setPrice(stockOrderDetailEntity.getPrice());
item.setPrice(stockOrderDetailEntity.getPrice()+"");
item.setFirstSalesInvNo(stockOrderDetailEntity.getFirstSalesInvNo());
item.setSecSalesInvNo(stockOrderDetailEntity.getSecSalesInvNo());
item.setInvoiceDate(stockOrderDetailEntity.getInvoiceDate());
@ -413,7 +413,7 @@ public class TestClient {
List<UdiwmsOrderDetail> items = udiwmsOrderRequest.getItem();
for (UdiwmsOrderDetail item : items) {
if (StrUtil.isBlank(item.getProductId()) || StrUtil.isBlank(item.getProductName()) || null == item.getPrice()
|| null == item.getCount() || 0 >= item.getPrice().compareTo(BigDecimal.ZERO) || 0 >= item.getCount()
|| null == item.getCount() || 0 >= item.getCount()
|| StrUtil.isBlank(item.getProductDate()) || StrUtil.isBlank(item.getStandard())) {
flag = false;
msg = "单据详情数据缺失";

39
api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/YyUCloud31Client.java
Unescape Escape View File

@ -2,9 +2,8 @@ package com.glxp.mipsdl.admin.client.http;
import cn.hutool.core.util.StrUtil;
import com.glxp.mipsdl.admin.client.BaseHttpClient;
import com.glxp.mipsdl.admin.entity.yyu8v31.YyUcloudV31SetEntity;
import com.glxp.mipsdl.admin.entity.yyu8v31.ErpOrderEntity;
import com.glxp.mipsdl.admin.entity.yyu8v31.ErpStockEntity;
import com.glxp.mipsdl.admin.entity.yyu8v31.YyUcloudV31SetEntity;
import com.glxp.mipsdl.admin.http.UBaseResponse;
import com.glxp.mipsdl.admin.http.UCloudBasicClient;
import com.glxp.mipsdl.admin.http.UCloudStockClient;
@ -254,27 +253,27 @@ public class YyUCloud31Client implements BaseHttpClient {
List<UOnhandQueryResponse> uOnhandQueryResponses;
uOnhandQueryResponses = response.getData().getDatas();
if (uOnhandQueryResponses != null && uOnhandQueryResponses.size() > 0) {
List<UdiwmsInvProductResponse> udiwmsOnhandResponses = new ArrayList<>();
List<UdiwmsInvProductResponse> invProductResponses = new ArrayList<>();
for (UOnhandQueryResponse onhandQueryResponse : uOnhandQueryResponses) {
UdiwmsInvProductResponse udiwmsOnhandResponse = new UdiwmsInvProductResponse();
udiwmsOnhandResponse.setName(onhandQueryResponse.getCinventory_name());
udiwmsOnhandResponse.setBatchNo(onhandQueryResponse.getVbatchcode());
udiwmsOnhandResponse.setCode(onhandQueryResponse.getCinventory_code());
udiwmsOnhandResponse.setCount(onhandQueryResponse.getNnum());
udiwmsOnhandResponse.setSpec(onhandQueryResponse.getInvspec());
udiwmsOnhandResponse.setRegisterCertNo(onhandQueryResponse.getInvtype());
udiwmsOnhandResponse.setWarehouseName(onhandQueryResponse.getCwarehouse_name());
udiwmsOnhandResponse.setWarehouseCode(onhandQueryResponse.getCwarehouse_code());
ErpStockEntity erpStockEntity = erpStockService.findByCode(udiwmsOnhandResponse.getCode(), udiwmsOnhandResponse.getBatchNo());
if (erpStockEntity != null) {
udiwmsOnhandResponse.setExpirationDate(erpStockEntity.getExpirationDate());
udiwmsOnhandResponse.setManufacturingDate(erpStockEntity.getManufacturingDate());
}
udiwmsOnhandResponses.add(udiwmsOnhandResponse);
UdiwmsInvProductResponse invProductResponse = new UdiwmsInvProductResponse();
invProductResponse.setName(onhandQueryResponse.getCinventory_name());
invProductResponse.setBatchNo(onhandQueryResponse.getVbatchcode());
invProductResponse.setCode(onhandQueryResponse.getCinventory_code());
invProductResponse.setCount(onhandQueryResponse.getNnum());
invProductResponse.setSpec(onhandQueryResponse.getInvspec());
invProductResponse.setRegisterCertNo(onhandQueryResponse.getInvtype());
invProductResponse.setWarehouseName(onhandQueryResponse.getCwarehouse_name());
invProductResponse.setWarehouseCode(onhandQueryResponse.getCwarehouse_code());
// ErpStockEntity erpStockEntity = erpStockService.findByCode(invProductResponse.getCode(), invProductResponse.getBatchNo());
// if (erpStockEntity != null) {
// udiwmsOnhandResponse.setExpirationDate(erpStockEntity.getExpirationDate());
// udiwmsOnhandResponse.setManufacturingDate(erpStockEntity.getManufacturingDate());
// }
invProductResponses.add(invProductResponse);
}
PageSimpleResponse<UdiwmsInvProductResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(udiwmsOnhandResponses.size() + 0L);
pageSimpleResponse.setList(udiwmsOnhandResponses);
pageSimpleResponse.setTotal(invProductResponses.size() + 0L);
pageSimpleResponse.setList(invProductResponses);
return ResultVOUtils.success(pageSimpleResponse);
}

14
api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/ZaxyyClient.java
Unescape Escape View File

@ -14,7 +14,6 @@ import com.glxp.mipsdl.admin.dao.auth.AuthAdminDao;
import com.glxp.mipsdl.admin.dao.basic.*;
import com.glxp.mipsdl.admin.dao.business.StockOrderDao;
import com.glxp.mipsdl.admin.dao.business.StockOrderDetailDao;
import com.glxp.mipsdl.admin.dao.business.StockOrderUploadLogDao;
import com.glxp.mipsdl.admin.dao.inout.CodesDao;
import com.glxp.mipsdl.admin.dao.inout.OrderDao;
import com.glxp.mipsdl.admin.dao.inventory.InvSubWarehouseDao;
@ -47,6 +46,7 @@ import com.glxp.mipsdl.admin.req.phxyy.PhWarehouseRequest;
import com.glxp.mipsdl.admin.req.thrsys.FilterThrInvWarehouseRequest;
import com.glxp.mipsdl.admin.res.system.PageSimpleResponse;
import com.glxp.mipsdl.admin.res.system.UdiwmsWarehouseDetail;
import com.glxp.mipsdl.admin.service.phxyy.StockOrderUploadLogService;
import com.glxp.mipsdl.admin.util.DateUtil;
import com.glxp.mipsdl.admin.util.HttpClient;
import com.glxp.mipsdl.admin.util.ThirdUtils;
@ -103,7 +103,7 @@ public class ZaxyyClient {
@Resource
private OrderDao orderDao;
@Resource
private StockOrderUploadLogDao stockOrderUploadLogDao;
StockOrderUploadLogService stockOrderUploadLogService;
String[] getHeaderArray() {
List<String> headArray = new ArrayList<>();
@ -339,7 +339,7 @@ public class ZaxyyClient {
item.setStandard(stockOrderDetailEntity.getSpec());
item.setRegisterNo(stockOrderDetailEntity.getZczbhhzbapzbh());
item.setPrice(stockOrderDetailEntity.getPrice());
item.setPrice(stockOrderDetailEntity.getPrice()+"");
item.setFirstSalesInvNo(stockOrderDetailEntity.getFirstSalesInvNo());
item.setSecSalesInvNo(stockOrderDetailEntity.getSecSalesInvNo());
item.setInvoiceDate(stockOrderDetailEntity.getInvoiceDate());
@ -413,25 +413,25 @@ public class ZaxyyClient {
uploadLog.setStatus(2);
uploadLog.setThrBillNo(thirdBillNo);
uploadLog.setResult("提交成功");
stockOrderUploadLogDao.insert(uploadLog);
stockOrderUploadLogService.insertOrUpdate(uploadLog);
orderDao.updateOrder(orderEntity);
return ResultVOUtils.success("提交成功");
}
uploadLog.setStatus(3);
uploadLog.setResult("提交失败，错误信息：" + baseResponse.getMessage());
stockOrderUploadLogDao.insert(uploadLog);
stockOrderUploadLogService.insertOrUpdate(uploadLog);
return baseResponse;
} catch (Exception e) {
log.error(e.getMessage(), e);
uploadLog.setStatus(3);
uploadLog.setResult("提交失败，错误信息：" + response);
stockOrderUploadLogDao.insert(uploadLog);
stockOrderUploadLogService.insertOrUpdate(uploadLog);
return ResultVOUtils.error(500, "提交失败");
}
} else {
uploadLog.setStatus(3);
uploadLog.setResult("提交失败，调用接口返回为空");
stockOrderUploadLogDao.insert(uploadLog);
stockOrderUploadLogService.insertOrUpdate(uploadLog);
return ResultVOUtils.error(500, "提交失败");
}
}

6
api-sync/src/main/java/com/glxp/mipsdl/admin/dao/business/StockOrderUploadLogDao.java
Unescape Escape View File

@ -8,4 +8,10 @@ public interface StockOrderUploadLogDao {
int insert(StockOrderUploadLogEntity record);
StockOrderUploadLogEntity findByBillNo(String billNo);
boolean upadte(StockOrderUploadLogEntity record);
}

1
api-sync/src/main/java/com/glxp/mipsdl/admin/entity/basic/BussinessLocalTypeEntity.java
Unescape Escape View File

@ -33,5 +33,6 @@ public class BussinessLocalTypeEntity {
private boolean scanPreIn;
private boolean vailInv;
private boolean codeFillCheck;
private int orderVisibleType; //订单详情展示方式：0：根据批次号展示，1:根据条码展示
}

4
api-sync/src/main/java/com/glxp/mipsdl/admin/http/UCloudStockClient.java
Unescape Escape View File

@ -188,11 +188,11 @@ public class UCloudStockClient {
String url = u8Url + "/u8cloud/api/ic/onhand/query";
RestTemplate restTemplate = new RestTemplate();
String params = JSONObject.toJSON(onhandQueryRequest).toString();
logger.info(url + "\n" + params);
logger.info("请求参数" + url + "\n" + params);
HttpEntity<String> httpEntity = new HttpEntity<>(params, headers);
String responseStr = restTemplate.postForObject(url, httpEntity, String.class);
responseStr = UHttpUtils.formatResponse(responseStr);
// logger.info(responseStr);
logger.info("请求结果" + responseStr);
UBaseResponse<List<UOnhandQueryResponse>> response;
try {
response = JSONObject.parseObject(responseStr, new TypeReference<UBaseResponse<List<UOnhandQueryResponse>>>() {

3
api-sync/src/main/java/com/glxp/mipsdl/admin/req/UdiwmsOrderDetail.java
Unescape Escape View File

@ -2,14 +2,13 @@ package com.glxp.mipsdl.admin.req;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
@Data
public class UdiwmsOrderDetail {
private String productId; //产品编码
private String productName; //产品名称
private BigDecimal price; //单价
private String price; //单价
private String batchNo; //批次号
private String expireDate; //失效日期
private String productDate; //生产日期

7
api-sync/src/main/java/com/glxp/mipsdl/admin/res/system/UdiwmsInvProductResponse.java
Unescape Escape View File

@ -1,25 +1,18 @@
package com.glxp.mipsdl.admin.res.system;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
@Data
public class UdiwmsInvProductResponse {
@JsonIgnore
private String code;
@JsonIgnore
private String name;
@JsonIgnore
private String spec;
private String batchNo;//批次号
@JsonIgnore
private String manufacturingDate;
@JsonIgnore
private String expirationDate;
private String warehouseCode;//货位号
private String warehouseName;//货位名称
@JsonIgnore
private String registerCertNo;
private Integer count;//数量
private String inventoryCode;//仓库号

22
api-sync/src/main/java/com/glxp/mipsdl/admin/service/phxyy/StockOrderUploadLogService.java
Unescape Escape View File

@ -0,0 +1,22 @@
package com.glxp.mipsdl.admin.service.phxyy;
import com.glxp.mipsdl.admin.dao.business.StockOrderUploadLogDao;
import com.glxp.mipsdl.admin.entity.business.StockOrderUploadLogEntity;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@Service
public class StockOrderUploadLogService {
@Resource
StockOrderUploadLogDao stockOrderUploadLogDao;
public void insertOrUpdate(StockOrderUploadLogEntity stockOrderUploadLogEntity) {
StockOrderUploadLogEntity temps = stockOrderUploadLogDao.findByBillNo(stockOrderUploadLogEntity.getBillNo());
if (temps != null) {
stockOrderUploadLogDao.upadte(stockOrderUploadLogEntity);
} else
stockOrderUploadLogDao.insert(stockOrderUploadLogEntity);
}
}

8
api-sync/src/main/resources/application-pro.properties
Unescape Escape View File

@ -2,8 +2,8 @@
server.port=9997
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
#spring.datasource.jdbc-url=jdbc:mysql://192.168.235.137:33306/udiwms_erp?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
#spring.datasource.jdbc-url=jdbc:mysql://192.168.0.109:3306/udiwms_ph1?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms_ph1?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
#spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.username=root
spring.datasource.password=123456
#spring.datasource.password=89083fb2fc145533
@ -29,11 +29,11 @@ API_KEY=1102
API_SECRET=4dc07484afd34e8083ba96e8fe564224
#文件导入
#0.NULL(空，未配置），1.GLXP(自定义规范标准），2.ZHIYE_V1(智业V1,诏安医院),3.YG_UDPLAT_V1(阳光采购平台）,4.PHXYY(平和县医院)
FILE_VERSION_FLAG=TEST
FILE_VERSION_FLAG=PHXYY
#接口实时获取
#0.NULL(空，未配置）,1.YONGYOU_U8_V3.1(用友3.1版本，片仔癀诊断） 2.YG_UDPLAT_V1.0(阳光采购平台) 3.TEST(标准接口，测试用),4.PHXYY(平和县医院)
#5.ZAXZYY(诏安县医院)
ONLINE_VESRION_FLAG=TEST
ONLINE_VESRION_FLAG=PHXYY
THIRD_ID=thirdId
ok.http.connect-timeout=3000
ok.http.read-timeout=3000

2
api-sync/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml
Unescape Escape View File

@ -11,7 +11,7 @@
basic_bussiness_type.action,basic_bussiness_type.checkEnable,basic_bustype_local.advanceType,basic_bustype_local.changeEnable,
basic_bustype_local.spUse,basic_bussiness_type.storageCode,basic_bussiness_type.corpType,basic_bussiness_type.mainAction
,basic_bussiness_type.prefix,basic_bustype_local.prefix localPrefix,basic_bustype_local.preIn,
basic_bussiness_type.ullageFill, basic_bussiness_type.scanPreIn, basic_bussiness_type.vailInv, basic_bussiness_type.codeFillCheck
basic_bussiness_type.ullageFill, basic_bussiness_type.scanPreIn, basic_bussiness_type.vailInv, basic_bussiness_type.codeFillCheck,basic_bussiness_type.orderVisibleType
FROM basic_bustype_local
inner join basic_bussiness_type
on basic_bustype_local.action = basic_bussiness_type.localAction

22
api-sync/src/main/resources/mybatis/mapper/business/StockOrderUploadLogDao.xml
Unescape Escape View File

@ -28,4 +28,26 @@
#{result,jdbcType=VARCHAR},#{fromType})
</insert>
<select id="findByBillNo" parameterType="java.lang.String"
resultType="com.glxp.mipsdl.admin.entity.business.StockOrderUploadLogEntity">
SELECT *
FROM stock_order_upload_log
where billNo = #{billNo} limit 1;
</select>
<update id="upadte" parameterType="com.glxp.mipsdl.admin.entity.business.StockOrderUploadLogEntity">
UPDATE stock_order_upload_log
<set>
<if test="billDate != null">`billDate`=#{billDate},</if>
<if test="billType != null">billType=#{billType},</if>
<if test="thrBillNo != null">`thrBillNo`=#{thrBillNo},</if>
<if test="submitTime != null">submitTime=#{submitTime},</if>
<if test="status != null">`status`=#{status},</if>
<if test="result != null">`result`=#{result},</if>
<if test="fromType != null">fromType=#{fromType},</if>
</set>
WHERE billNo=#{billNo}
</update>
</mapper>
Write Preview
Loading…
Cancel
Save