1.修改第提交单据逻辑

master
x_z 3 years ago
parent 45119fb179
commit d82d01f143

@ -1,23 +1,47 @@
package com.glxp.mipsdl.admin.client.http; package com.glxp.mipsdl.admin.client.http;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ReflectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference; import com.alibaba.fastjson.TypeReference;
import com.glxp.mipsdl.admin.config.ThirdSysConfig; 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.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.InvWarehouseDao;
import com.glxp.mipsdl.admin.dao.phxyy.BasicThirdSysDetailDao; import com.glxp.mipsdl.admin.dao.phxyy.BasicThirdSysDetailDao;
import com.glxp.mipsdl.admin.dao.thrsys.ThrInvWarehouseDao;
import com.glxp.mipsdl.admin.entity.auth.AuthAdmin;
import com.glxp.mipsdl.admin.entity.basic.BasicThirdSysBusApiEntity;
import com.glxp.mipsdl.admin.entity.basic.BussinessLocalTypeEntity;
import com.glxp.mipsdl.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.mipsdl.admin.entity.basic.UnitMaintainEntity;
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.phxyy.BasicThirdSysDetailEntity;
import com.glxp.mipsdl.admin.entity.thrsys.ThrInvWarehouseEntity;
import com.glxp.mipsdl.admin.entity.zy.ZaZyHeareRequest; import com.glxp.mipsdl.admin.entity.zy.ZaZyHeareRequest;
import com.glxp.mipsdl.admin.req.UdiwmsOnhandRequest; import com.glxp.mipsdl.admin.req.*;
import com.glxp.mipsdl.admin.req.UdiwmsOrderRequest; import com.glxp.mipsdl.admin.req.basic.BussinessLocalTypeFilterRequest;
import com.glxp.mipsdl.admin.req.UdiwmsPreInOrderRequest;
import com.glxp.mipsdl.admin.req.ZaxzyyOrderRequest;
import com.glxp.mipsdl.admin.req.phxyy.PhBusTypeRequest; import com.glxp.mipsdl.admin.req.phxyy.PhBusTypeRequest;
import com.glxp.mipsdl.admin.req.phxyy.PhProductRequest; import com.glxp.mipsdl.admin.req.phxyy.PhProductRequest;
import com.glxp.mipsdl.admin.req.phxyy.PhUnitRequest; import com.glxp.mipsdl.admin.req.phxyy.PhUnitRequest;
import com.glxp.mipsdl.admin.req.phxyy.PhWarehouseRequest; import com.glxp.mipsdl.admin.req.phxyy.PhWarehouseRequest;
import com.glxp.mipsdl.admin.service.phxyy.BasicThirdSysBusApiService; import com.glxp.mipsdl.admin.req.thrsys.FilterThrInvWarehouseRequest;
import com.glxp.mipsdl.admin.service.phxyy.BussinessOriginTypeService; import com.glxp.mipsdl.admin.util.DateUtil;
import com.glxp.mipsdl.admin.util.HttpClient; import com.glxp.mipsdl.admin.util.HttpClient;
import com.glxp.mipsdl.common.res.BaseResponse; import com.glxp.mipsdl.common.res.BaseResponse;
import com.glxp.mipsdl.common.util.ResultVOUtils; import com.glxp.mipsdl.common.util.ResultVOUtils;
@ -25,10 +49,12 @@ import lombok.extern.slf4j.Slf4j;
import org.dom4j.Document; import org.dom4j.Document;
import org.dom4j.DocumentException; import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper; import org.dom4j.DocumentHelper;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
@Slf4j @Slf4j
@ -39,7 +65,34 @@ public class ZaxyyClient {
private ThirdSysConfig thirdSysConfig; private ThirdSysConfig thirdSysConfig;
@Resource @Resource
private HttpClient httpClient; private HttpClient httpClient;
@Resource
private StockOrderDao stockOrderDao;
@Resource
private StockOrderDetailDao stockOrderDetailDao;
@Resource
private BussinessLocalTypeDao bussinessLocalTypeDao;
@Resource
private BasicThirdSysBusApiDao thirdSysBusApiDao;
@Resource
private InvWarehouseDao invWarehouseDao;
@Resource
private ThrInvWarehouseDao thrInvWarehouseDao;
@Resource
private UnitMaintainDao unitMaintainDao;
@Resource
private BussinessTypeDao bussinessTypeDao;
@Resource
private BasicThirdSysDetailDao basicThirdSysDetailDao;
@Resource
private CodesDao codesDao;
@Resource
private UdiRelevanceDao udiRelevanceDao;
@Resource
private AuthAdminDao authAdminDao;
@Resource
private OrderDao orderDao;
@Resource
private StockOrderUploadLogDao stockOrderUploadLogDao;
String[] getHeaderArray() { String[] getHeaderArray() {
List<String> headArray = new ArrayList<>(); List<String> headArray = new ArrayList<>();
@ -58,13 +111,6 @@ public class ZaxyyClient {
return strArray; return strArray;
} }
@Resource
private BasicThirdSysBusApiService basicThirdSysBusApiService;
@Resource
private BussinessOriginTypeService bussinessOriginTypeService;
@Resource
private BasicThirdSysDetailDao basicThirdSysDetailDao;
public BaseResponse testConnect() { public BaseResponse testConnect() {
String msgHead = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + String msgHead = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
@ -186,10 +232,151 @@ public class ZaxyyClient {
} }
public BaseResponse submitOrders(ZaxzyyOrderRequest udiwmsOrderRequest) { public BaseResponse submitOrders(ZaxzyyOrderRequest udiwmsOrderRequest) {
if (StrUtil.isEmpty(udiwmsOrderRequest.getBillType())) { if (StrUtil.isBlank(udiwmsOrderRequest.getId())) {
return ResultVOUtils.error(500, "单据类型不能未空"); return ResultVOUtils.error(500, "单据ID不能为空");
}
//查询单据和详情信息,组装第三方系统接口参数所需数据
StockOrderEntity stockOrderEntity = stockOrderDao.findById(udiwmsOrderRequest.getId());
List<StockOrderDetailEntity> stockOrderDetailEntities = stockOrderDetailDao.findByOrderIdFk(stockOrderEntity.getId());
udiwmsOrderRequest.setBillDate(stockOrderEntity.getBilldate());
udiwmsOrderRequest.setBillNo(stockOrderEntity.getBillNo());
BussinessLocalTypeFilterRequest bussinessLocalTypeFilterRequest = new BussinessLocalTypeFilterRequest();
bussinessLocalTypeFilterRequest.setAction(stockOrderEntity.getBillType());
List<BussinessLocalTypeEntity> bussinessLocalTypeEntities = bussinessLocalTypeDao.filterJoin(bussinessLocalTypeFilterRequest);
BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeEntities.get(0);
//查询第三方系统的单据ID及第三方系统标识
BasicThirdSysBusApiEntity thirdSysBusApiEntity = thirdSysBusApiDao.selectByCode(stockOrderEntity.getBillType());
if (StrUtil.isBlank(thirdSysBusApiEntity.getUrl())) {
return ResultVOUtils.error(500, "接口未配置,无法提交!");
}
String thirdId = getThirdId(thirdSysBusApiEntity);
udiwmsOrderRequest.setThirdSys(thirdId); //第三方系统标识
udiwmsOrderRequest.setBillType(thirdSysBusApiEntity.getThirdBuyCode());
if (bussinessLocalTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT) {
udiwmsOrderRequest.setCorpId(stockOrderEntity.getCorpName()); //往来单位编码需转换为第三方系统的ID
udiwmsOrderRequest.setCorpName(stockOrderEntity.getCorpName()); //往来单位名称,需转换为第三方系统的名称
} else if (bussinessLocalTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INNOR) {
List<InvWarehouseEntity> invWarehouseEntities = invWarehouseDao.selectByCode(stockOrderEntity.getCorpId());
InvWarehouseEntity invWarehouseEntity = invWarehouseEntities.get(0);
try {
//根据第三方系统标识,获取对应字段的值
FilterThrInvWarehouseRequest filterThrInvWarehouseRequest = new FilterThrInvWarehouseRequest();
filterThrInvWarehouseRequest.setCode(invWarehouseEntity.getThirdId());
filterThrInvWarehouseRequest.setThirdSysFk(thirdId);
List<ThrInvWarehouseEntity> thrInvWarehouseEntities = thrInvWarehouseDao.filterThrInvWarehouse(filterThrInvWarehouseRequest);
ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseEntities.get(0);
udiwmsOrderRequest.setCorpId(thrInvWarehouseEntity.getCode()); //往来单位编码需转换为第三方系统的ID
udiwmsOrderRequest.setCorpName(thrInvWarehouseEntity.getName()); //往来单位名称,需转换为第三方系统的名称
} catch (Exception e) {
log.error("查询单据对应的第三方往来单位信息异常", e);
}
} else if (bussinessLocalTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
//查询往来单位第三方系统对照编码
UnitMaintainEntity unitMaintainEntity = unitMaintainDao.selectThirdInfoByErpId(stockOrderEntity.getCorpId());
try {
String thirdCorpId = (String) ReflectUtil.getFieldValue(unitMaintainEntity, unitMaintainEntity.getClass().getField(thirdId));
udiwmsOrderRequest.setCorpId(thirdCorpId); //往来单位编码需转换为第三方系统的ID
String thirdName = getThirdName(thirdId);
String thirdCorpName = (String) ReflectUtil.getFieldValue(unitMaintainEntity, unitMaintainEntity.getClass().getField(thirdName));
udiwmsOrderRequest.setCorpName(thirdCorpName); //往来单位名称,需转换为第三方系统的名称
} catch (Exception e) {
log.error(e.getMessage(), e);
}
}
InvWarehouseEntity invWarehouseEntity = invWarehouseDao.selectOneByCode(stockOrderEntity.getLocStorageCode());
try {
ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectByCode(invWarehouseEntity.getThirdId(), thirdId);
udiwmsOrderRequest.setLocStorageCode(thrInvWarehouseEntity.getCode());
udiwmsOrderRequest.setLocStorageName(thrInvWarehouseEntity.getName());
} catch (Exception e) {
log.error("查询第三方系统仓库异常", e);
}
udiwmsOrderRequest.setBillFlag(stockOrderEntity.getBillFlag()); //单据状态
//查询单据出入库类型
String mainAction = bussinessTypeDao.selectInoutTypebByLocalAction(stockOrderEntity.getBillType());
if (ConstantType.TYPE_PUT.equals(mainAction)) {
udiwmsOrderRequest.setInoutType(1); //出入库类型:入库
} else if (ConstantType.TYPE_OUT.equals(mainAction)) {
udiwmsOrderRequest.setInoutType(2); //出入库类型:出库
}
udiwmsOrderRequest.setRemark("udi管理系统提交单据"); //备注
//组装明细数据
List<WarehouseEntity> warehouseEntities = codesDao.findByReceiptId(stockOrderEntity.getOrderIdFk());
List<UdiwmsOrderDetail> items = new ArrayList<>(stockOrderDetailEntities.size());
for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntities) {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceDao.selectById(stockOrderDetailEntity.getRelId());
UdiwmsOrderDetail item = new UdiwmsOrderDetail();
BeanUtil.copyProperties(stockOrderDetailEntity, item);
if (StrUtil.isNotEmpty(stockOrderDetailEntity.getProductDate())) {
item.setProductDate(DateUtil.formatExpireTime("20" + stockOrderDetailEntity.getProductDate()));
}
if (StrUtil.isNotEmpty(stockOrderDetailEntity.getExpireDate())) {
item.setExpireDate(DateUtil.formatExpireTime("20" + stockOrderDetailEntity.getExpireDate()));
}
item.setMeasname(udiRelevanceEntity.getMeasname());
item.setStandard(stockOrderDetailEntity.getSpec());
item.setRegisterNo(stockOrderDetailEntity.getZczbhhzbapzbh());
List<WarehouseEntity> warehouseEntityList = filterCodes(stockOrderDetailEntity, warehouseEntities);
if (CollUtil.isNotEmpty(warehouseEntityList)) {
List<UdiwmsOrderDetail.CodeDetaiEntity> codeDetaiEntities = new ArrayList<>();
warehouseEntityList.forEach(warehouseEntity -> {
UdiwmsOrderDetail.CodeDetaiEntity codeDetaiEntity = new UdiwmsOrderDetail.CodeDetaiEntity();
BeanUtils.copyProperties(warehouseEntity, codeDetaiEntity);
codeDetaiEntities.add(codeDetaiEntity);
});
item.setCodeList(codeDetaiEntities);
}
try {
String thirdProductId = (String) ReflectUtil.getFieldValue(udiRelevanceEntity, thirdId);
item.setProductId(thirdProductId);
String thirdName = getThirdName(thirdId);
String thirdProductName = (String) ReflectUtil.getFieldValue(udiRelevanceEntity, thirdName);
item.setProductName(thirdProductName);
items.add(item);
} catch (Exception e) {
log.error(e.getMessage(), e);
}
}
udiwmsOrderRequest.setItem(items);
//查询扫码单据
OrderEntity orderEntity = orderDao.findById(stockOrderEntity.getOrderIdFk());
ZaZyHeareRequest zaZyHeareRequest = new ZaZyHeareRequest();
String key = null;
//提交订单到第三方系统
if (thirdSysBusApiEntity.getUrl().equals("saveMasterialInput")) {
//采购入库单据
zaZyHeareRequest.setMsgHeader(getMsgHeader("saveMasterialInput"));
key = "orderSubmitUrl";
zaZyHeareRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsOrderRequest));
} else if (thirdSysBusApiEntity.getUrl().equals("saveMaterialHight")) {
//临床出库
zaZyHeareRequest.setMsgHeader(getMsgHeader("saveMaterialHight"));
key = "preInOrderSubmit";
UdiwmsPreInOrderRequest udiwmsPreInOrderRequest = submitPreInOrderToThirdSys(udiwmsOrderRequest, orderEntity);
zaZyHeareRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsPreInOrderRequest));
} }
BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByOrderType("orderSubmitUrl", thirdSysConfig.getThirdSysConfig().getThirdId(), udiwmsOrderRequest.getBillType());
BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByOrderType(key, thirdSysConfig.getThirdSysConfig().getThirdId(), udiwmsOrderRequest.getBillType());
String interStr = ""; String interStr = "";
if (StrUtil.isNotEmpty(basicThirdSysDetailEntity.getOrderTypeUrl())) { if (StrUtil.isNotEmpty(basicThirdSysDetailEntity.getOrderTypeUrl())) {
@ -198,23 +385,48 @@ public class ZaxyyClient {
} else { } else {
interStr = basicThirdSysDetailEntity.getValue(); interStr = basicThirdSysDetailEntity.getValue();
} }
ZaZyHeareRequest zaZyHeareRequest = new ZaZyHeareRequest();
zaZyHeareRequest.setMsgHeader(getMsgHeader("saveMasterialInput"));
zaZyHeareRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsOrderRequest));
//记录日志
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() + interStr, zaZyHeareRequest, getHeaderArray()); String response = httpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + interStr, zaZyHeareRequest, getHeaderArray());
response = parseErrorMsg(response); response = parseErrorMsg(response);
try { if (StrUtil.isNotBlank(response)){
BaseResponse baseResponse = try {
JSONObject.parseObject(response, new TypeReference<BaseResponse>() { BaseResponse baseResponse =
}); JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
return baseResponse; });
} catch (Exception e) { if (baseResponse.getCode().equals(20000)) {
e.printStackTrace(); String thirdBillNo = String.valueOf(baseResponse.getData());
} orderEntity.setExportStatus(1);
orderEntity.setThirdBillNo(thirdBillNo);
return ResultVOUtils.error(500, "网络错误,或远程服务器异常无法返回正确结果" + "" + response + ")"); uploadLog.setStatus(2);
uploadLog.setThrBillNo(null);
uploadLog.setResult("提交成功");
stockOrderUploadLogDao.insert(uploadLog);
return ResultVOUtils.success("提交成功");
}
uploadLog.setStatus(3);
uploadLog.setResult("提交失败,错误信息:" + baseResponse.getMessage());
stockOrderUploadLogDao.insert(uploadLog);
return baseResponse;
} catch (Exception e) {
log.error(e.getMessage(), e);
uploadLog.setStatus(3);
uploadLog.setResult("提交失败,错误信息:" + e.getMessage());
stockOrderUploadLogDao.insert(uploadLog);
return ResultVOUtils.error(500, "提交失败");
}
}else {
uploadLog.setStatus(3);
uploadLog.setResult("提交失败,调用接口返回为空");
stockOrderUploadLogDao.insert(uploadLog);
return ResultVOUtils.error(500, "提交失败");
}
} }
@ -282,6 +494,55 @@ public class ZaxyyClient {
return ResultVOUtils.error(500, "网络错误,或远程服务器异常无法返回正确结果" + "" + response + ")"); return ResultVOUtils.error(500, "网络错误,或远程服务器异常无法返回正确结果" + "" + response + ")");
} }
public List<WarehouseEntity> filterCodes(StockOrderDetailEntity stockOrderDetailEntity, List<WarehouseEntity> warehouseEntities) {
List<WarehouseEntity> results = new ArrayList<>();
if (CollUtil.isNotEmpty(warehouseEntities)) {
for (WarehouseEntity warehouseEntity : warehouseEntities) {
if (StrUtil.trimToEmpty(warehouseEntity.getRelId()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getRelId()))
&& StrUtil.trimToEmpty(warehouseEntity.getBatchNo()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo()))
) {
results.add(warehouseEntity);
}
}
}
return results;
}
public UdiwmsPreInOrderRequest submitPreInOrderToThirdSys(ZaxzyyOrderRequest udiwmsOrderRequest, OrderEntity orderEntity) {
UdiwmsPreInOrderRequest udiwmsPreInOrderRequest = new UdiwmsPreInOrderRequest();
if (udiwmsOrderRequest != null) {
BeanUtils.copyProperties(udiwmsOrderRequest, udiwmsPreInOrderRequest);
udiwmsPreInOrderRequest.setLocInvCode(udiwmsOrderRequest.getLocStorageCode());
udiwmsPreInOrderRequest.setLocInvName(udiwmsOrderRequest.getLocStorageName());
if (orderEntity.getReviewUser() != null) {
AuthAdmin authAdmin = authAdminDao.findById(orderEntity.getReviewUser().longValue());
udiwmsPreInOrderRequest.setActor(authAdmin.getEmployeeName());
} else if (orderEntity.getCreateUser() != null) {
AuthAdmin authAdmin = authAdminDao.findById(orderEntity.getCreateUser().longValue());
udiwmsPreInOrderRequest.setActor(authAdmin.getEmployeeName());
}
List<UdiwmsPreInOrderRequest.ItemDTO> itemDTOS = new ArrayList<>();
if (CollUtil.isNotEmpty(udiwmsOrderRequest.getItem())) {
for (UdiwmsOrderDetail udiwmsOrderDetail : udiwmsOrderRequest.getItem()) {
if (CollUtil.isNotEmpty(udiwmsOrderDetail.getCodeList())) {
for (UdiwmsOrderDetail.CodeDetaiEntity codeDetaiEntity : udiwmsOrderDetail.getCodeList()) {
UdiwmsPreInOrderRequest.ItemDTO itemDTO = new UdiwmsPreInOrderRequest.ItemDTO();
BeanUtils.copyProperties(udiwmsOrderDetail, itemDTO);
itemDTO.setCode(codeDetaiEntity.getCode());
itemDTO.setCount(codeDetaiEntity.getCount());
itemDTOS.add(itemDTO);
}
}
}
}
udiwmsPreInOrderRequest.setItems(itemDTOS);
}
return udiwmsPreInOrderRequest;
}
public String parseErrorMsg(String response) { public String parseErrorMsg(String response) {
if (response.contains("<root")) { if (response.contains("<root")) {
@ -296,4 +557,62 @@ public class ZaxyyClient {
return response; return response;
} }
/**
*
*
* @param thirdId
* @return
*/
private String getThirdName(String thirdId) {
String thirdName = null;
switch (thirdId) {
case "thirdId":
thirdName = "thirdName";
break;
case "thirdId1":
thirdName = "thirdName1";
break;
case "thirdId2":
thirdName = "thirdName2";
break;
case "thirdId3":
thirdName = "thirdName3";
break;
case "thirdId4":
thirdName = "thirdName4";
break;
default:
break;
}
return thirdName;
}
/**
* @param thirdSysBusApiEntity
* @return
*/
private String getThirdId(BasicThirdSysBusApiEntity thirdSysBusApiEntity) {
String thirdId = null;
switch (thirdSysBusApiEntity.getThirdSys()) {
case "thirdId":
thirdId = "thirdId";
break;
case "third1":
thirdId = "thirdId1";
break;
case "third2":
thirdId = "thirdId2";
break;
case "third3":
thirdId = "thirdId3";
break;
case "third4":
thirdId = "thirdId4";
break;
default:
break;
}
return thirdId;
}
} }

@ -0,0 +1,147 @@
package com.glxp.mipsdl.admin.constant;
/**
*
*/
public class ConstantStatus {
//订单状态
public static final Integer ORDER_STATUS_TEMP_SAVE = -1; //等待提交
public static final Integer ORDER_STATUS_PROCESS = 1; //等待处理
public static final Integer ORDER_STATUS_CHECK = 2; //等待校验
public static final Integer ORDER_STATUS_FAIL = 3; //重码校验失败
public static final Integer ORDER_STATUS_SUCCESS = 4; //已校验
public static final Integer ORDER_STATUS_ADDITIONAL = 5; //补录单据
public static final Integer ORDER_STATUS_DOING = 6;
//ERP校验状态
public static final Integer ORDER_CHECK_SUCCESS = 2; //校验成功
public static final Integer ORDER_CHECK_FAIL = 1; //校验失败
public static final Integer ORDER_CHECK_UN = 0; //未校验
//ERP订单上传状态
public static final Integer ORDER_EXPORT_UN = 0; //未导出
public static final Integer ORDER_EXPORT_ED = 1; //已导出
public static final Integer ORDER_EXPORT_FAIL = 2; //导出失败
//ERP订单签字状态
public static final Integer ORDER_SIGN_UN = 0; //未签字
public static final Integer ORDER_SIGN_ED = 1; //已签字
public static final Integer ORDER_SIGN_FAIL = 2; //签字失败
//UDI产品信息表字段类型
public static final Integer PRODUCT_TYPE_UDI = 0;
public static final Integer PRODUCT_TYPE_THIRD = 1;
//DI类型
public static final Integer DI_TYPE_MAIN = 1;//主标识
public static final Integer DI_TYPE_SYDY = 2;//使用单元
public static final Integer DI_TYPE_BTBS = 3;//本体标识
public static final Integer DI_TYPE_BZBS = 4;//包装标识
//业务单据状态
public static String SORDER_DRAFT = "1";//草稿
public static String SORDER_ALLOC = "2";//未配货
public static String SORDER_CHECK = "3";//待校验
public static String SORDER_CHECKED = "4";//已校验
public static String SORDER_DELIVER = "5";//已送货
public static final int RECEIVE_UN = 0; //未验收
public static final int RECEIVE_ED = 1; //已验收
public static final int RECEIVE_NOT = 2;//不需要验收
public static String SORDER_PRINT_UN = "101";//101未打印102已打印
public static String SORDER_PRINT_ED = "102";//
//业务单据来源
public static String ST_WEB_ADD = "1"; //前端新增
public static String ST_THIRD_SEL = "2"; //第三方选入
public static String ST_SCAN_ADD = "3"; //扫码单据转换
//业务单据详情DI绑定状态
public static int ORDER_DETAIL_DI_NONE = 2;
public static int ORDER_DETAIL_DI_MUTI = 1;
public static int ORDER_DETAIL_DI_ONE = 0;
//业务单据来源
public static final int SORDER_FROM_ONLINE = 2; //在线实时拉取第三方业务单据
public static final int SORDER_FROM_CACHE = 0; //本地缓存第三方业务单据
public static final int SORDER_FROM_LOCAL = 1; //本地生成业务单据
//业务单据详情DI绑定供应商状态
public static int ORDER_DETAIL_SUP_NONE = 2;
public static int ORDER_DETAIL_SUP_MUTI = 1;
public static int ORDER_DETAIL_SUP_ONE = 0;
//采购类型
public static final Integer PRUCHASE_ADVANCE = 1; //预入库
public static final Integer PRUCHASE_COMMON = 2; //普通采购
//往来单位类型
public static final int CORP_SICK = 1; //病人
public static final int CORP_SP = 2; //供应商
public static final int CORP_INTTERNAL = 3; //内部科室等
public static final int CORP_SPECIAL = 4; //内部科室等
//往来信息类型-单据
public static final int CORP_TYPE_INPUT = 2; //客户
public static final int CORP_TYPE_OUT = 0; //供应商
public static final int CORP_TYPE_INNOR = 1; //内部科室等
public static final int CORP_TYPE_SPECIAL = 3;
public static final int CORP_SICK_SICK = 1;
public static final int CORP_SICK_CUS = 2;
//单据来源
public static final int FROM_UDIMS = 1; //1.UDIMS平台
public static final int FROM_WEBNEW = 2; //网页新增
public static final int FROM_PDAED = 3; //pda已校验
public static final int FROM_PDAUN = 4; //pda未校验
public static final int FROM_PC = 5; //pc端扫码精灵
public static final int FROM_CHANGE = 6; //单据流转
public static final int FROM_UDISP = 7; //供应商平台
public static final int FROM_PEACE_CHANGE = 8; //平衡补单
//DI类型
public static final int DITYPE_MAIN = 1; //主标识
public static final int DITYPE_SYDY = 2; //使用单元标识
public static final int DITYPE_OWN = 3; //本体标识
public static final int DITYPE_PACK = 4; //包装标识
//流转单据类型
public static final int ORDER_CHANGE_NORMAL_IN = 1; //补采购入库
public static final int ORDER_CHANGE_NORMAL_ADV_IN = 2; //补寄售转入
public static final int ORDER_CHANGE_ADVANCE_IN = 3; //补寄售入库
public static final int ORDER_CHANGE_ADVANCE_OUT = 4; //补寄售出库
public static final int ORDER_CHANGE_INNOR_NORMAL_IN = 5; //补调拨入库
public static final String SYNC_BASIC_DATA = "AutoUploadAllData";
public static final String SYNC_BUS_TYPE = "AutoUploadBusType";
public static final String SYNC_SCAN_ORDER = "AutoUploadOrder";
//自动下载所有数据
public static final String SYNC_DOWNLOAD_BASIC_DATA = "AutoDownloadAllData";
//自动下载单据数据
public static final String SYNC_DOWNLOAD_BUS_TYPE = "AutoDownloadBusType";
//自动下载单据数据
public static final String SYNC_DOWNLOAD_SCAN_ORDER = "AutoDownloadOrder";
//自动下载DI数据
public static final String SYNC_DOWNLOAD_DI_PRODUCTS = "AutoDownloadDiProducts";
public static final int SYNC_STATUS_SUCCESS = 1; //处理成功
public static final int SYNC_STATUS_FAIL = 2; //处理失败
public static final int SYNC_STATUS_WAIT = 0; //等待处理
public static final int THIRD_ORDER_UPLOAD = 1; //业务单据上传至第三方
public static final int THIRD_ORDER_RECEIVE = 2; //接收第三方上传扫码单据
}

@ -0,0 +1,23 @@
package com.glxp.mipsdl.admin.constant;
public interface ConstantType {
String TYPE_PUT_PRODUCT = "ProduceWareHouseIn"; //生产入库
String TYPE_PUT_PURCHASE = "PurchaseWareHouseIn"; //采购入库
String TYPE_PUT_RETURN = "ReturnWareHouseIn"; //退货入库
String TYPE_PUT_ALLOT = "AllocateWareHouseIn"; //调拨入库
String TYPE_OUT_SALE = "SalesWareHouseOut"; //销售出库
String TYPE_OUT_RETURN = "ReturnWareHouseOut"; //退货出库
String TYPE_OUT_ALLOT = "AllocateWareHouseOut"; //调拨出库
String TYPE_OUT_DESTORY = "DestoryWareHouseOut"; //销毁出库
String TYPE_OUT_STRAIGHT = "DirectAllocateWareHouseOut"; //直调出库
String TYPE_OUT_REWORK = "ReworkWareHouseOut"; //返工出库
String TYPE_OUT_CHECK = "CheckWareHouseOut"; //盘点 抽检出库
String TYPE_CODE_REPLACE = "CodeReplace"; //码替换
String TYPE_CODE_DESTORY = "CodeDestory"; //码注销
String TYPE_STOCK_CHECK = "StockCheck"; //盘点
String TYPE_PUT = "WareHouseIn"; //出库
String TYPE_OUT = "WareHouseOut"; //入库
}

@ -25,10 +25,8 @@ public class UdiWmsController {
private String curFlag; private String curFlag;
@Resource @Resource
YyUCloud31Client pzhzdClient; YyUCloud31Client pzhzdClient;
@Resource @Resource
private TestClient testClient; private TestClient testClient;
@Resource @Resource
private UdPlatClient udPlatClient; private UdPlatClient udPlatClient;
@Resource @Resource
@ -270,9 +268,6 @@ public class UdiWmsController {
} else if (curFlag.equals("ZAXZYY")) { } else if (curFlag.equals("ZAXZYY")) {
return zaxyyClient.testConnect(); return zaxyyClient.testConnect();
} else return ResultVOUtils.error(500, "暂不支持联通性测试!"); } else return ResultVOUtils.error(500, "暂不支持联通性测试!");
} }
} }

@ -0,0 +1,19 @@
package com.glxp.mipsdl.admin.dao.auth;
import com.glxp.mipsdl.admin.entity.auth.AuthAdmin;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface AuthAdminDao {
/**
* id
*
* @param id id
* @return
*/
AuthAdmin findById(Long id);
}

@ -0,0 +1,22 @@
package com.glxp.mipsdl.admin.dao.basic;
import com.glxp.mipsdl.admin.entity.basic.BasicThirdSysBusApiEntity;
import com.glxp.mipsdl.admin.req.phxyy.FilterBusTypeRequest;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface BasicThirdSysBusApiDao {
BasicThirdSysBusApiEntity selectByCode(@Param("code") String code);
boolean insertSysBusApi(com.glxp.mipsdl.admin.entity.phxyy.BasicThirdSysBusApiEntity basicThirdSysEntity);
boolean updateSysBusApi(com.glxp.mipsdl.admin.entity.phxyy.BasicThirdSysBusApiEntity basicThirdSysEntity);
List<com.glxp.mipsdl.admin.entity.phxyy.BasicThirdSysBusApiEntity> filterSysBusApi(FilterBusTypeRequest filterBasicThirdSysDetailRequest);
}

@ -0,0 +1,13 @@
package com.glxp.mipsdl.admin.dao.basic;
import com.glxp.mipsdl.admin.entity.basic.BussinessLocalTypeEntity;
import com.glxp.mipsdl.admin.req.basic.BussinessLocalTypeFilterRequest;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface BussinessLocalTypeDao {
List<BussinessLocalTypeEntity> filterJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest);
}

@ -0,0 +1,16 @@
package com.glxp.mipsdl.admin.dao.basic;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface BussinessTypeDao {
/**
*
*
* @param localAction
* @return
*/
String selectInoutTypebByLocalAction(@Param("localAction") String localAction);
}

@ -0,0 +1,12 @@
package com.glxp.mipsdl.admin.dao.basic;
import com.glxp.mipsdl.admin.entity.basic.UdiRelevanceEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface UdiRelevanceDao {
UdiRelevanceEntity selectById(@Param("id") String id);
}

@ -0,0 +1,18 @@
package com.glxp.mipsdl.admin.dao.basic;
import com.glxp.mipsdl.admin.entity.basic.UnitMaintainEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface UnitMaintainDao {
/**
* erpId
*
* @param erpId
* @return
*/
UnitMaintainEntity selectThirdInfoByErpId(@Param("erpId") String erpId);
}

@ -0,0 +1,12 @@
package com.glxp.mipsdl.admin.dao.business;
import com.glxp.mipsdl.admin.entity.business.StockOrderEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface StockOrderDao {
StockOrderEntity findById(@Param("id") String id);
}

@ -0,0 +1,12 @@
package com.glxp.mipsdl.admin.dao.business;
import com.glxp.mipsdl.admin.entity.business.StockOrderDetailEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface StockOrderDetailDao {
List<StockOrderDetailEntity> findByOrderIdFk(String orderIdFk);
}

@ -0,0 +1,11 @@
package com.glxp.mipsdl.admin.dao.business;
import com.glxp.mipsdl.admin.entity.business.StockOrderUploadLogEntity;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface StockOrderUploadLogDao {
int insert(StockOrderUploadLogEntity record);
}

@ -0,0 +1,15 @@
package com.glxp.mipsdl.admin.dao.inout;
import com.glxp.mipsdl.admin.entity.inout.WarehouseEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface CodesDao {
List<WarehouseEntity> findByReceiptId(@Param("orderId") String orderId);
}

@ -0,0 +1,11 @@
package com.glxp.mipsdl.admin.dao.inout;
import com.glxp.mipsdl.admin.entity.inout.OrderEntity;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface OrderDao {
OrderEntity findById(String orderId);
}

@ -0,0 +1,18 @@
package com.glxp.mipsdl.admin.dao.inventory;
import com.glxp.mipsdl.admin.entity.inventory.InvWarehouseEntity;
import java.util.List;
public interface InvWarehouseDao {
List<InvWarehouseEntity> selectByCode(String code);
/**
*
*
* @param locStorageCode
* @return
*/
InvWarehouseEntity selectOneByCode(String code);
}

@ -1,17 +0,0 @@
package com.glxp.mipsdl.admin.dao.phxyy;
import com.glxp.mipsdl.admin.entity.phxyy.BasicThirdSysBusApiEntity;
import com.glxp.mipsdl.admin.req.phxyy.FilterBusTypeRequest;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface BasicThirdSysBusApiDao {
boolean insertSysBusApi(BasicThirdSysBusApiEntity basicThirdSysEntity);
boolean updateSysBusApi(BasicThirdSysBusApiEntity basicThirdSysEntity);
List<BasicThirdSysBusApiEntity> filterSysBusApi(FilterBusTypeRequest filterBasicThirdSysDetailRequest);
}

@ -0,0 +1,14 @@
package com.glxp.mipsdl.admin.dao.thrsys;
import com.glxp.mipsdl.admin.entity.thrsys.ThrInvWarehouseEntity;
import com.glxp.mipsdl.admin.req.thrsys.FilterThrInvWarehouseRequest;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface ThrInvWarehouseDao {
List<ThrInvWarehouseEntity> filterThrInvWarehouse(FilterThrInvWarehouseRequest filterThrInvWarehouseRequest);
ThrInvWarehouseEntity selectByCode(@Param("code") String code, @Param("thirdSysFk") String thirdSysFk);
}

@ -0,0 +1,32 @@
package com.glxp.mipsdl.admin.entity.auth;
import lombok.Data;
import java.util.Date;
@Data
public class AuthAdmin {
// 主键
private Long id;
// 昵称
private String userName;
// 登录密码
private String passWord;
// 最后登录ip
private String lastLoginIp;
// 最后登录时间
private Date lastLoginTime;
// 创建时间
private Date createTime;
// 状态
private Integer userFlag;
private Date lastModifyTime;
private String comments;
private String employeeName;
private Integer CustomerId;
private String locInvCode;
private String locSubInvCode;
}

@ -0,0 +1,33 @@
package com.glxp.mipsdl.admin.entity.basic;
import lombok.Data;
@Data
public class BasicThirdSysBusApiEntity {
private Integer id;
private String code;
private String name;
private String thirdBuyName; //第三方系统单据类型名称
private String thirdBuyCode; //第三方系统单据类型代码
private String thirdSys;
private String url;
private Integer type;
private String remark;
private Integer inoutType;
//扩展字段 暂未启用
private String filed;
private String filed1;
private String filed2;
private String filed3;
private String filed4;
/**
* "code": "29104",
* "name": "采购入库",
* "remark": "无形资产入库单",
* "inoutType": "1"
*/
}

@ -0,0 +1,37 @@
package com.glxp.mipsdl.admin.entity.basic;
import lombok.Data;
import java.util.Date;
@Data
public class BussinessLocalTypeEntity {
private Integer id;
private String action;
private String name;
private String localAction;
private String originAction;
private String mainAction;
private String localName;
private String remark;
private boolean checkEnable;
private boolean advanceType;
private boolean changeEnable;
private boolean spUse;
private String storageCode;
private int corpType;
private String defaultUnit;
private boolean genUnit;
private String thirdAction;
private String thirdSys;
private Date updateTime;
private String prefix;
private String localPrefix;
private boolean preIn;
private boolean outTospms;
private boolean ullageFill;
private boolean scanPreIn;
private boolean vailInv;
private boolean codeFillCheck;
}

@ -0,0 +1,75 @@
package com.glxp.mipsdl.admin.entity.basic;
import lombok.Data;
@Data
public class UdiRelevanceEntity {
private String id;
private String thirdId;
private String thirdName;
private String uuid;
private Boolean isUseDy;
private String updateTime;
private String thirdId1;
private String thirdId2;
private String thirdId3;
private String thirdId4;
private String thirdName1;
private String thirdName2;
private String thirdName3;
private String thirdName4;
private String manufactory;
private String measname;
private String ybbm;
private String sptm;
private Boolean isDisable;
private Boolean isLock;
private String mainId;
private String mainName;
private Integer lockStatus;
private String udplatCode;
private Boolean isAdavence;
private String supName;
private String originUuid;
private String price;
private String modifyTime;//修改时间
private Boolean isCheck;
private boolean allowNoBatch;
private boolean allowNoExpire;
private boolean allowNoProduct;
//规格型号
private String ggxh;
//器械类别
private String qxlb;
//产品类别
private String cplb;
//分类编码
private String flbm;
//医疗器械注册人
private String ylqxzcrbarmc;
//注册人英文名称
private String ylqxzcrbarywmc;
//统一社会信用号
private String tyshxydm;
//注册证/备案号
private String zczbhhzbapzbh;
//产品描述
private String cpms;
public Integer getLockStatus() {
if (lockStatus == null)
return 1;
return lockStatus;
}
}

@ -0,0 +1,36 @@
package com.glxp.mipsdl.admin.entity.basic;
import lombok.Data;
import java.util.Date;
@Data
public class UnitMaintainEntity {
public Integer id;
public String thirdId;
public String thirdName;
public String erpId;
public String name;
public String spell;
public String addr;
public String status;
public String type;
public String contact;
public String mobile;
public String creditNo;
public String thirdId1;
public String thirdId2;
public String thirdId3;
public String thirdId4;
public String thirdName1;
public String thirdName2;
public String thirdName3;
public String thirdName4;
public Date updateTime;
}

@ -0,0 +1,43 @@
package com.glxp.mipsdl.admin.entity.business;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class StockOrderDetailEntity {
private String id;
private String orderIdFk;
private String productId;
private String productName;
private String spec;
private String batchNo;
private String expireDate;
private String productDate;
private Integer count;
private Integer reCount;
private Integer sweepCount;
private String ylqxzcrbarmc;
private String zczbhhzbapzbh;
private BigDecimal price;
private String relId;
//销售清单号(第二票)
private String secSalesListNo;
//销售发票号(第一票)
private String firstSalesInvNo;
//销售发票号(第二票)
private String secSalesInvNo;
//开票日期
private String invoiceDate;
private String manufactory;
private boolean allowNoBatch;
private String code;
private String serialNo;
}

@ -0,0 +1,51 @@
package com.glxp.mipsdl.admin.entity.business;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class StockOrderEntity {
private String id;
private String billNo;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private String billdate;
private String corpId;
private String corpName;
private String billType;
private String billFlag;
private String thirdSysFk;
private String status;
private String statusInfo;
private String type;
private String sourceType;
private String printStatus;
private String unitIdFk;
private String customerId;
private String thirdOrderFk;
private String orderIdFk;
private BigDecimal totalPrice;
private String locStorageCode;
private String invWarehouseCode;
private String fromSubInvCode;
private String fromSubInvName;
//补单单号
private String supplementNo;
private Integer createUser;
private Integer reviewUser;
//审核时间
private Date auditTime;
//更新时间
private Date updateTime;
//委托验收已完成
private boolean entrustEnd;
private String billTypeName;
private String subInvName;
private String invName;
}

@ -0,0 +1,55 @@
package com.glxp.mipsdl.admin.entity.business;
import lombok.Data;
import java.util.Date;
/**
*
*/
@Data
public class StockOrderUploadLogEntity {
private Long id;
/**
*
*/
private String billNo;
/**
*
*/
private Date billDate;
/**
*
*/
private String billType;
/**
*
*/
private String thrBillNo;
/**
*
*/
private Date submitTime;
/**
* 0. 1. 2. 3.
*/
private Integer status;
/**
*
*/
private String result;
private String billTypeName;
private Integer fromType;
private String uploadData;
}

@ -0,0 +1,66 @@
package com.glxp.mipsdl.admin.entity.inout;
import lombok.Data;
import java.util.Date;
@Data
public class OrderEntity {
private String id;
private String corpOrderId;
private String action;
private String actDate;
private String actor;
private String mainAction;
private String fromCorpId;
private String fromCorp;
private Integer status;
private Integer fromType;
private Integer contrastStatus;
private String erpFk;
private Integer signStatus;
private String stockCheckFk;
private String remark;
private Integer receiveStatus;
private String supId;
private String customerId;
private Integer exportStatus;
private String exportFilePath;
private Integer dlCount;
private String invStorageCode;
private String invWarehouseCode;
private String locStorageCode;
//补单单号
private String supplementNo;
private String ullageSupNo;
private Integer createUser;
private Integer reviewUser;
private boolean isError;
private boolean outChangeEnable;
private String originUllageSupNo;
private Date updateTime;
private boolean preCheck;
//审核时间
private Date auditTime;
private String thirdBillNo;
//复制单号,多个单号之间使用英文逗号,分隔
private String replicateNo;
private boolean syncOutChange;
private String createTime;
private String fromSubInvCode;
private String billTypeName;
private String subInvName;
private String invName;
}

@ -0,0 +1,57 @@
package com.glxp.mipsdl.admin.entity.inout;
import lombok.Data;
@Data
public class WarehouseEntity {
private Long id;
private String action;
private String mainAction;
private String code;
private String corpOrderId;
private String actor;
private String actDate;
private String fromCorpId;
private String fromCorp;
private String orderId;
private String batchNo;
private String produceDate;
private String expireDate;
private String serialNo;
private Integer count;
private String packageLevel;
private String warehouseCode;
private String customerId;
private String nameCode;
private Integer sCount;
private String supId;//供应商ID
private String supName;
private String invStorageCode;
private String invWarehouseCode;
private String relId;
private Integer status;
private String locStorageCode;
private String fromSubInvCode;
private String mySupId;
public String getSupId() {
if (supId == null) {
return null;
} else if (supId.equals(""))
return null;
return supId;
}
public Integer getCount() {
if (count == null) {
return 1;
}
if (count == 0)
return 1;
return count;
}
}

@ -0,0 +1,33 @@
package com.glxp.mipsdl.admin.entity.inventory;
import lombok.Data;
import java.util.Date;
@Data
public class InvWarehouseEntity {
private Integer id;
private Integer pid;
private String code;
private String name;
private Boolean advanceType;
private Boolean isDefault;
private Integer status;
private Date updateTime;
private String remark;
private Integer level;
private String pcode;
private String pName;
/**
* ID
*/
private String thirdId;
private String thirdId1;
private String thirdId2;
private String thirdId3;
private String thirdId4;
private boolean spUse;
}

@ -0,0 +1,37 @@
package com.glxp.mipsdl.admin.entity.thrsys;
import lombok.Data;
import java.util.Date;
/**
*
*/
@Data
public class ThrInvWarehouseEntity {
private Integer id;
private Integer pid;
private String code;
private String name;
private Boolean advanceType;
private Boolean isDefault;
private Integer status;
private Date updateTime;
private String remark;
/**
*
*/
private Integer level;
/**
*
*/
private String pcode;
/**
*
*/
private String thirdSysFk;
}

@ -27,6 +27,11 @@ public class UdiwmsOrderDetail {
private String remark1; //备注1/规格型号ID private String remark1; //备注1/规格型号ID
private String remark2; //备注2/型号 private String remark2; //备注2/型号
private String remark3; //备注3/规格 private String remark3; //备注3/规格
private boolean allowNoBatch;
private String code;
private String serialNo;
private List<CodeDetaiEntity> codeList; private List<CodeDetaiEntity> codeList;
public static class CodeDetaiEntity { public static class CodeDetaiEntity {

@ -7,6 +7,8 @@ import java.util.List;
@Data @Data
public class UdiwmsOrderRequest { public class UdiwmsOrderRequest {
private String id; //业务单据ID
private String startDate; //起始日期 private String startDate; //起始日期
private String endDate; //结束日期 private String endDate; //结束日期
private String billNo; //单据号 private String billNo; //单据号

@ -2,6 +2,8 @@ package com.glxp.mipsdl.admin.req;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List; import java.util.List;
@Data @Data
@ -20,6 +22,41 @@ public class ZaxzyyOrderRequest {
private String locInvName; private String locInvName;
private String thirdSys; private String thirdSys;
private String actor; private String actor;
private String id;
private String thirdSysFk;
private String status;
private String statusInfo;
private String type;
private String sourceType;
private String printStatus;
private String unitIdFk;
private String customerId;
private String thirdOrderFk;
private String orderIdFk;
private BigDecimal totalPrice;
private String locStorageCode;
private String locStorageName;
private String invWarehouseCode;
private String fromSubInvCode;
private String fromSubInvName;
//补单单号
private String supplementNo;
private Integer createUser;
private Integer reviewUser;
//审核时间
private Date auditTime;
//更新时间
private Date updateTime;
//委托验收已完成
private boolean entrustEnd;
private String billTypeName;
private String subInvName;
private String invName;
private List<UdiwmsOrderDetail> item; //单据详情数组 private List<UdiwmsOrderDetail> item; //单据详情数组
} }

@ -0,0 +1,19 @@
package com.glxp.mipsdl.admin.req.basic;
import lombok.Data;
@Data
public class BussinessLocalTypeFilterRequest {
private String action;
private String name;
private String mainAction;
private Boolean enabled;
private String originAction;
private Boolean changeEnable;
private Boolean isFilterBind;
private Boolean spUse;
private Boolean isFilter;
private String code;
private Integer userId;
private String lastUpdateTime;
}

@ -0,0 +1,28 @@
package com.glxp.mipsdl.admin.req.thrsys;
import lombok.Data;
import java.util.Date;
@Data
public class FilterThrInvWarehouseRequest{
private Integer id;
private Integer pid;
private String code;
private String name;
private Boolean advanceType;
private Boolean isDefault;
private Date updateTime;
private String key;
private String pcode;
private Integer level;
private String lastUpdateTime;
/**
*
*/
private String thirdSysFk;
}

@ -1,7 +1,7 @@
package com.glxp.mipsdl.admin.service.phxyy.impl; package com.glxp.mipsdl.admin.service.phxyy.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import com.glxp.mipsdl.admin.dao.phxyy.BasicThirdSysBusApiDao; import com.glxp.mipsdl.admin.dao.basic.BasicThirdSysBusApiDao;
import com.glxp.mipsdl.admin.entity.phxyy.BasicThirdSysBusApiEntity; import com.glxp.mipsdl.admin.entity.phxyy.BasicThirdSysBusApiEntity;
import com.glxp.mipsdl.admin.req.phxyy.FilterBusTypeRequest; import com.glxp.mipsdl.admin.req.phxyy.FilterBusTypeRequest;
import com.glxp.mipsdl.admin.service.phxyy.BasicThirdSysBusApiService; import com.glxp.mipsdl.admin.service.phxyy.BasicThirdSysBusApiService;

@ -477,4 +477,14 @@ public class DateUtil extends org.apache.commons.lang3.time.DateUtils {
condition.put("startDate",df.format(calendar.getTime())); condition.put("startDate",df.format(calendar.getTime()));
return condition; return condition;
} }
public static String formatExpireTime(String str) {
try {
Date date = DateUtil.parseDate(str, "yyyyMMdd");
return formatDate(date, "yyyy-MM-dd");
} catch (ParseException e) {
e.printStackTrace();
}
return str;
}
} }

@ -0,0 +1,15 @@
<?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.mipsdl.admin.dao.auth.AuthAdminDao">
<select id="findById" parameterType="hashmap" resultType="com.glxp.mipsdl.admin.entity.auth.AuthAdmin">
SELECT *
FROM auth_user
<where>
id = #{id}
</where>
LIMIT 1
</select>
</mapper>

@ -0,0 +1,12 @@
<?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.mipsdl.admin.dao.basic.BasicThirdSysBusApiDao">
<select id="selectByCode" resultType="com.glxp.mipsdl.admin.entity.basic.BasicThirdSysBusApiEntity">
select *
from basic_third_sys_bus_api
where code = #{code}
</select>
</mapper>

@ -0,0 +1,35 @@
<?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.mipsdl.admin.dao.basic.BussinessLocalTypeDao">
<select id="filterJoin" parameterType="com.glxp.mipsdl.admin.req.basic.BussinessLocalTypeFilterRequest"
resultType="com.glxp.mipsdl.admin.entity.basic.BussinessLocalTypeEntity">
SELECT basic_bustype_local.id,basic_bustype_local.name localName, basic_bustype_local.action
localAction,originAction,
basic_bussiness_type.name ,
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
FROM basic_bustype_local
inner join basic_bussiness_type
on basic_bustype_local.action = basic_bussiness_type.localAction
<where>
<if test="name != ''and name != null">
AND basic_bustype_local.name LIKE concat('%',#{name},'%')
</if>
<if test="action != ''and action != null">
AND basic_bustype_local.action LIKE concat(#{action},'%')
</if>
<if test="enabled != ''and enabled != null">
AND basic_bussiness_type.enable =#{enabled}
</if>
<if test="spUse != ''and spUse != null">
AND basic_bustype_local.spUse =#{spUse}
</if>
</where>
group by basic_bussiness_type.action
</select>
</mapper>

@ -0,0 +1,12 @@
<?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.mipsdl.admin.dao.basic.BussinessTypeDao">
<select id="selectInoutTypebByLocalAction" resultType="java.lang.String">
select mainAction
from basic_bussiness_type
where localAction = #{localAction}
</select>
</mapper>

@ -0,0 +1,13 @@
<?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.mipsdl.admin.dao.basic.UdiRelevanceDao">
<select id="selectById" parameterType="java.lang.String"
resultType="com.glxp.mipsdl.admin.entity.basic.UdiRelevanceEntity">
select *
FROM basic_udirel
WHERE id = #{id}
</select>
</mapper>

@ -0,0 +1,13 @@
<?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.mipsdl.admin.dao.basic.UnitMaintainDao">
<select id="selectThirdInfoByErpId" resultType="com.glxp.mipsdl.admin.entity.basic.UnitMaintainEntity">
select thirdId, thirdName
from basic_corp
where erpId = #{erpId}
</select>
</mapper>

@ -0,0 +1,12 @@
<?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.mipsdl.admin.dao.business.StockOrderDao">
<select id="findById" resultType="com.glxp.mipsdl.admin.entity.business.StockOrderEntity">
select *
from stock_order
where id = #{id}
</select>
</mapper>

@ -0,0 +1,11 @@
<?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.mipsdl.admin.dao.business.StockOrderDetailDao">
<select id="findByOrderIdFk" resultType="com.glxp.mipsdl.admin.entity.business.StockOrderDetailEntity">
select * from stock_order_detail where orderIdFk = #{orderIdFk}
</select>
</mapper>

@ -0,0 +1,31 @@
<?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.mipsdl.admin.dao.business.StockOrderUploadLogDao">
<resultMap id="BaseResultMap" type="com.glxp.mipsdl.admin.entity.business.StockOrderUploadLogEntity">
<!--@mbg.generated-->
<!--@Table stock_order_upload_log-->
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="billNo" jdbcType="VARCHAR" property="billNo"/>
<result column="billDate" jdbcType="TIMESTAMP" property="billDate"/>
<result column="billType" jdbcType="VARCHAR" property="billType"/>
<result column="thrBillNo" jdbcType="VARCHAR" property="thrBillNo"/>
<result column="submitTime" jdbcType="TIMESTAMP" property="submitTime"/>
<result column="status" jdbcType="INTEGER" property="status"/>
<result column="result" jdbcType="VARCHAR" property="result"/>
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, billNo, billDate, billType, thrBillNo, submitTime, `status`, `result`
</sql>
<insert id="insert" keyColumn="id" keyProperty="id"
parameterType="com.glxp.mipsdl.admin.entity.business.StockOrderUploadLogEntity" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into stock_order_upload_log (billNo, billDate, billType,
thrBillNo, submitTime, `status`,
`result`,fromType)
values (#{billNo,jdbcType=VARCHAR}, #{billDate,jdbcType=TIMESTAMP}, #{billType,jdbcType=VARCHAR},
#{thrBillNo,jdbcType=VARCHAR}, #{submitTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER},
#{result,jdbcType=VARCHAR},#{fromType})
</insert>
</mapper>

@ -0,0 +1,13 @@
<?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.mipsdl.admin.dao.inout.CodesDao">
<select id="findByReceiptId" parameterType="Map" resultType="com.glxp.mipsdl.admin.entity.inout.WarehouseEntity">
SELECT *
FROM io_codes
WHERE `orderId` = #{orderId}
AND 'action' <![CDATA[ <> ]]> 'StockCheck'
</select>
</mapper>

@ -0,0 +1,12 @@
<?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.mipsdl.admin.dao.inout.OrderDao">
<select id="findById" resultType="com.glxp.mipsdl.admin.entity.inout.OrderEntity">
select *
from io_order
where id = #{orderId}
</select>
</mapper>

@ -0,0 +1,12 @@
<?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.mipsdl.admin.dao.inventory.InvWarehouseDao">
<select id="selectByCode" resultType="com.glxp.mipsdl.admin.entity.inventory.InvWarehouseEntity">
select *, name as pName from inv_warehouse where code = #{code}
</select>
<select id="selectOneByCode" resultType="com.glxp.mipsdl.admin.entity.inventory.InvWarehouseEntity">
select *, name as pName from inv_warehouse where code = #{code} limit 1
</select>
</mapper>

@ -0,0 +1,60 @@
<?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.mipsdl.admin.dao.thrsys.ThrInvWarehouseDao">
<select id="filterThrInvWarehouse" parameterType="com.glxp.mipsdl.admin.req.thrsys.FilterThrInvWarehouseRequest"
resultType="com.glxp.mipsdl.admin.entity.thrsys.ThrInvWarehouseEntity">
SELECT *
FROM thr_inv_warehouse thrInv
left join basic_third_sys thrSys on thrInv.thirdSysFk = thrSys.thirdId
<where>
thrSys.enabled = true
<if test="id != '' and id != null">
AND id = #{id}
</if>
<if test="pid != '' and pid != null">
AND pid = #{pid}
</if>
<if test="code != '' and code != null">
AND code = #{code}
</if>
<if test="name != '' and name != null">
AND name = #{name}
</if>
<if test="advanceType != null">
AND advanceType = #{advanceType}
</if>
<if test="isDefault != null">
AND isDefault = #{isDefault}
</if>
<if test="key != null">
and (code like concat('%', #{key}, '%')
or `name` like concat('%', #{key}, '%'))
</if>
<if test="lastUpdateTime != null and lastUpdateTime != ''">
<![CDATA[
and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
]]>
</if>
<if test="thirdSysFk != null">
and thirdSysFk = #{thirdSysFk}
</if>
</where>
</select>
<select id="selectByCode" resultType="com.glxp.mipsdl.admin.entity.thrsys.ThrInvWarehouseEntity">
select * from thr_inv_warehouse thrInv
left join basic_third_sys thrSys on thrInv.thirdSysFk = thrSys.thirdId
<where>
<if test="code != '' and code != null">
AND code = #{code}
</if>
<if test="thirdSysFk != '' and thirdSysFk != null">
AND thirdSysFk = #{thirdSysFk}
</if>
</where>
limit 1
</select>
</mapper>
Loading…
Cancel
Save