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

feat: 供三方调用接口开发

Browse Source
dev
chenhc 2 years ago
parent ab75ed83b4
commit 3b365cd0f3
4 changed files with 469 additions and 456 deletions
Show Stats Download Patch File Download Diff File

29
src/main/java/com/glxp/mipsdl/client/njxyy/njxyyClient.java
Unescape Escape View File

@ -35,10 +35,7 @@ import com.glxp.mipsdl.entity.thrsys.ThrProductsEntity;
import com.glxp.mipsdl.entity.thrsys.ThrSystemBusApiEntity;
import com.glxp.mipsdl.http.HttpClient;
import com.glxp.mipsdl.req.base.*;
import com.glxp.mipsdl.req.base.forthird.ForBasicProductsSearchFilter;
import com.glxp.mipsdl.req.base.forthird.ForInvOutScanCodeFilter;
import com.glxp.mipsdl.req.base.forthird.ForInvOutScanCodeRequest;
import com.glxp.mipsdl.req.base.forthird.ForInvProductsFilter;
import com.glxp.mipsdl.req.base.forthird.*;
import com.glxp.mipsdl.req.phxyy.PhBusTypeRequest;
import com.glxp.mipsdl.req.phxyy.PhOrderRequest;
import com.glxp.mipsdl.req.phxyy.PhProductRequest;
@ -498,16 +495,26 @@ public class njxyyClient extends CommonHttpClient {
ForInvOutScanCodeRequest forInvOutScanCodeRequest = new ForInvOutScanCodeRequest();
System.out.println(JSON.toJSONString(forInvOutScanCodeFilter));
// TODO: 2024/3/15 forInvOutScanCodeFilter 转换为 入参的业务系统的实体 forInvOutScanCodeRequest
IoOrderRequest ioOrderRequest = new IoOrderRequest();
ioOrderRequest.setAction("qqqqq");
List<IoOrderCodeRequest> codeRequestList = new ArrayList<>();
IoOrderCodeRequest ioOrderCodeRequest = new IoOrderCodeRequest();
ioOrderCodeRequest.setCode("11111");
codeRequestList.add(ioOrderCodeRequest);
forInvOutScanCodeRequest.setCodeRequestList(codeRequestList);
forInvOutScanCodeRequest.setIoOrderRequest(ioOrderRequest);
String response = httpClient.postUDIWMSJson(thirdSysConfig.getPostInvOutScanCode(), forInvOutScanCodeRequest);
BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class);
if (baseResponse.getCode() == 20000){
ForInvOutScanCodeResponse forInvOutScanCodeResponse =
JSONObject.parseObject(String.valueOf(baseResponse.getData()), ForInvOutScanCodeResponse.class);
System.out.println(forInvOutScanCodeResponse);
}else {
}
// if (baseResponse.getCode() == 20000){
// ForInvOutScanCodeResponse forInvOutScanCodeResponse =
// JSONObject.parseObject(String.valueOf(baseResponse.getData()), ForInvOutScanCodeResponse.class);
// }else {
//
// }
return baseResponse;
}

445
src/main/java/com/glxp/mipsdl/req/base/forthird/ForInvOutScanCodeRequest.java
Unescape Escape View File

@ -1,9 +1,6 @@
package com.glxp.mipsdl.req.base.forthird;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import java.util.Date;
import java.util.List;
@Data
@ -12,446 +9,4 @@ public class ForInvOutScanCodeRequest {
private IoOrderRequest ioOrderRequest;
private List<IoOrderCodeRequest> codeRequestList;
@Data
static class IoOrderRequest{
/**
* 单据号
*/
@TableField(value = "billNo")
private String billNo;
/**
* 手持终端订单号
*/
@TableField(value = "corpOrderId")
private String corpOrderId;
/**
* 主业务类型
*/
@TableField(value = "mainAction")
private String mainAction;
/**
* 业务类型
*/
@TableField(value = "`action`")
private String action;
/**
* 往来单位
*/
@TableField(value = "fromCorp")
private String fromCorp;
/**
* 往来部门
*/
@TableField(value = "fromDeptCode")
private String fromDeptCode;
/**
* 往来仓库
*/
@TableField(value = "fromInvCode")
private String fromInvCode;
/**
* 单据来源（1.UDIMS平台；2.网页新增；3.pda已校验；4.pda未校验；5.pc端扫码精灵）
*/
@TableField(value = "fromType")
private Integer fromType;
/**
* 1:草稿；2:已提交待处理;3:处理成功待校验;4:处理异常;5:校验成功待审核;6:校验失败;7:审核通过;8:审核拒绝
*/
@TableField(value = "`status`")
private Integer status;
/**
* 1.草稿；2:已提交;3:已审核
*/
@TableField(value = "dealStatus")
private Integer dealStatus;
/**
* 创建人
*/
@TableField(value = "`createUser`")
private String createUser;
/**
* 创建时间
*/
@TableField(value = "createTime")
private Date createTime;
/**
* 更新人
*/
@TableField(value = "updateUser")
private String updateUser;
/**
* 更新时间
*/
@TableField(value = "updateTime")
private Date updateTime;
/**
* 验收人
*/
@TableField(value = "reviewUser")
private String reviewUser;
/**
* 验收时间
*/
@TableField(value = "auditTime")
private Date auditTime;
@TableField(value = "checkUser")
private String checkUser;
@TableField(value = "checkTime")
private Date checkTime;
/**
* ID
*/
@TableField(value = "customerId")
private String customerId;
/**
* 部门编码
*/
@TableField(value = "deptCode")
private String deptCode;
/**
* 仓库编码
*/
@TableField(value = "invCode")
private String invCode;
/**
* 单据流转
*/
@TableField(value = "outChangeEnable")
private Boolean outChangeEnable;
/**
* 单据流转上级单号
*/
@TableField(value = "originUllageSupNo")
private String originUllageSupNo;
/**
* 单据流转下级单号
*/
@TableField(value = "ullageSupNo")
private String ullageSupNo;
/**
* 平衡补单单号
*/
@TableField(value = "supplementNo")
private String supplementNo;
/**
* 第三方系统单号(提交后返回）
*/
@TableField(value = "thirdBillNo")
private String thirdBillNo;
/**
* 复制单据单号，多个单号之间使用,隔开
*/
@TableField(value = "replicateNo")
private String replicateNo;
/**
* 单据打印备注
*/
@TableField(value = "printRemark")
private String printRemark;
/**
* 单据备注
*/
@TableField(value = "remark")
private String remark;
@TableField(value = "errMsg")
private String errMsg;
@TableField(value = "preOutBillNo")
private String preOutBillNo;
@TableField(value = "preInBillNo")
private String preInBillNo;
@TableField(value = "entrustEnd")
private boolean entrustEnd;
@TableField(value = "reviewSp")
private boolean reviewSp; //是否验收外网单据时，需忽略流转更改为待审核
@TableField(value = "confirmUser")
private String confirmUser;
/**
* 单据类型：1.业务单据，2:扫码单据,3.正常处理单据 只有草稿，异常，待处理
*/
@TableField(value = "orderType")
private Integer orderType;
//单据同步状态
@TableField(value = "syncStatus")
private Integer syncStatus;
@TableField(value = "fromReceiveBillNo")
private String fromReceiveBillNo;
@TableField(value = "fromThrBillNo")
private String fromThrBillNo;
/**
* 导出状态/上传状态（0.未导出，1.已导出，2.导出失败）
*/
@TableField(value = "exportStatus")
private Integer exportStatus;
@TableField(value = "busType")
private Integer busType; //1:正常；2：送货；3.到货
@TableField(value = "deliveryStatus")
private Integer deliveryStatus; //单据送货验收状态
@TableField(value = "processStatus")
private Integer processStatus; //退货单据处理状态
@TableField(value = "inCodeStatus")
private Integer inCodeStatus; //内部码生成状态
@TableField(value = "relKey")
private String relKey; //关联单据唯一键
@TableField(value = "suppleCount")
private Integer suppleCount; //补单次数
@TableField(value = "checkStatus")
private Integer checkStatus; //确认状态
// 预验收按单出库，退货
@TableField(value = "checkPreInOrders")
private String checkPreInOrders;
// 预验收按货位出库，退货
@TableField(value = "checkPreInInvCode")
private String checkPreInInvCode;
// 预验收按货位出库，退货
@TableField(value = "checkPreInSpaceCode")
private String checkPreInSpaceCode;
// 当前货位
@TableField(value = "curSpaceCode")
private String curSpaceCode;
// 预验收、寄售当前货位
@TableField(value = "preCurSpaceCode")
private String preCurSpaceCode;
/**
* 出库病人信息
*/
@TableField(value = "outSickInfo")
private String outSickInfo;
@TableField(value = "fromSpmsOrders")
private String fromSpmsOrders;
/**
* 是否已被选入
*/
@TableField(value = "preInSelected")
private Integer preInSelected;
/**
* 病人住院号
*/
@TableField(value = "sickerAdNum")
private String sickerAdNum;
/**
* 往来患者code
*/
@TableField(value = "fromPatientCode")
private String fromPatientCode;
}
@Data
static class IoOrderCodeRequest{
/**
* UDI码
*/
@TableField(value = "code")
private String code;
public void setCode(String code) {
this.code = code;
this.setErrUdiCode(code.replace("\u001D", ""));
}
/**
* 去掉GS1符号错误条码
*/
@TableField(value = "errUdiCode")
private String errUdiCode;
/**
* 主单据类型（入库，出库）
*/
@TableField(value = "mainAction")
private String mainAction;
/**
* 单据类型
*/
@TableField(value = "`action`")
private String action;
/**
* 订单号外键
*/
@TableField(value = "orderId")
private String orderId;
/**
* 手持终端订单号
*/
@TableField(value = "corpOrderId")
private String corpOrderId;
/**
* DI标识
*/
@TableField(value = "nameCode")
private String nameCode;
/**
* 批次号
*/
@TableField(value = "batchNo")
private String batchNo;
/**
* 生产日期
*/
@TableField(value = "produceDate")
private String produceDate;
/**
* 失效日期
*/
@TableField(value = "expireDate")
private String expireDate;
/**
* 序列号
*/
@TableField(value = "serialNo")
private String serialNo;
/**
* 包装级别
*/
@TableField(value = "packageLevel")
private String packageLevel;
/**
* 供应商ID外键
*/
@TableField(value = "supId")
private String supId;
/**
* 耗材字典ID外键
*/
@TableField(value = "relId")
private Long relId;
/**
* 扫码数量
*/
@TableField(value = "`count`")
private Integer count;
/**
* 实际数量
*/
@TableField(value = "reCount")
private Integer reCount;
/**
* 部门编码外键
*/
@TableField(value = "deptCode")
private String deptCode;
/**
* 仓库编码外键
*/
@TableField(value = "invCode")
private String invCode;
/**
* 货位编码外键
*/
@TableField(value = "warehouseCode")
private String warehouseCode;
/**
* 预验收，寄售所在货位编码
*/
@TableField(value = "preSpaceCode")
private String preSpaceCode;
@TableField(value = "preInSpaceCode")
private String preInSpaceCode;
/**
* 更新日期
*/
@TableField(value = "updateTime")
private Date updateTime;
/**
* 创建日期
*/
@TableField(value = "createTime")
private Date createTime;
/**
* 入院批号
*/
@TableField(value = "inBatchNo")
private String inBatchNo;
}
}

160
src/main/java/com/glxp/mipsdl/req/base/forthird/IoOrderCodeRequest.java
Unescape Escape View File

@ -0,0 +1,160 @@
package com.glxp.mipsdl.req.base.forthird;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import java.util.Date;
@Data
public class IoOrderCodeRequest{
/**
* UDI码
*/
@TableField(value = "code")
private String code;
public void setCode(String code) {
this.code = code;
this.setErrUdiCode(code.replace("\u001D", ""));
}
/**
* 去掉GS1符号错误条码
*/
@TableField(value = "errUdiCode")
private String errUdiCode;
/**
* 主单据类型（入库，出库）
*/
@TableField(value = "mainAction")
private String mainAction;
/**
* 单据类型
*/
@TableField(value = "`action`")
private String action;
/**
* 订单号外键
*/
@TableField(value = "orderId")
private String orderId;
/**
* 手持终端订单号
*/
@TableField(value = "corpOrderId")
private String corpOrderId;
/**
* DI标识
*/
@TableField(value = "nameCode")
private String nameCode;
/**
* 批次号
*/
@TableField(value = "batchNo")
private String batchNo;
/**
* 生产日期
*/
@TableField(value = "produceDate")
private String produceDate;
/**
* 失效日期
*/
@TableField(value = "expireDate")
private String expireDate;
/**
* 序列号
*/
@TableField(value = "serialNo")
private String serialNo;
/**
* 包装级别
*/
@TableField(value = "packageLevel")
private String packageLevel;
/**
* 供应商ID外键
*/
@TableField(value = "supId")
private String supId;
/**
* 耗材字典ID外键
*/
@TableField(value = "relId")
private Long relId;
/**
* 扫码数量
*/
@TableField(value = "`count`")
private Integer count;
/**
* 实际数量
*/
@TableField(value = "reCount")
private Integer reCount;
/**
* 部门编码外键
*/
@TableField(value = "deptCode")
private String deptCode;
/**
* 仓库编码外键
*/
@TableField(value = "invCode")
private String invCode;
/**
* 货位编码外键
*/
@TableField(value = "warehouseCode")
private String warehouseCode;
/**
* 预验收，寄售所在货位编码
*/
@TableField(value = "preSpaceCode")
private String preSpaceCode;
@TableField(value = "preInSpaceCode")
private String preInSpaceCode;
/**
* 更新日期
*/
@TableField(value = "updateTime")
private Date updateTime;
/**
* 创建日期
*/
@TableField(value = "createTime")
private Date createTime;
/**
* 入院批号
*/
@TableField(value = "inBatchNo")
private String inBatchNo;
}

291
src/main/java/com/glxp/mipsdl/req/base/forthird/IoOrderRequest.java
Unescape Escape View File

@ -0,0 +1,291 @@
package com.glxp.mipsdl.req.base.forthird;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import java.util.Date;
@Data
public class IoOrderRequest{
/**
* 单据号
*/
@TableField(value = "billNo")
private String billNo;
/**
* 手持终端订单号
*/
@TableField(value = "corpOrderId")
private String corpOrderId;
/**
* 主业务类型
*/
@TableField(value = "mainAction")
private String mainAction;
/**
* 业务类型
*/
@TableField(value = "`action`")
private String action;
/**
* 往来单位
*/
@TableField(value = "fromCorp")
private String fromCorp;
/**
* 往来部门
*/
@TableField(value = "fromDeptCode")
private String fromDeptCode;
/**
* 往来仓库
*/
@TableField(value = "fromInvCode")
private String fromInvCode;
/**
* 单据来源（1.UDIMS平台；2.网页新增；3.pda已校验；4.pda未校验；5.pc端扫码精灵）
*/
@TableField(value = "fromType")
private Integer fromType;
/**
* 1:草稿；2:已提交待处理;3:处理成功待校验;4:处理异常;5:校验成功待审核;6:校验失败;7:审核通过;8:审核拒绝
*/
@TableField(value = "`status`")
private Integer status;
/**
* 1.草稿；2:已提交;3:已审核
*/
@TableField(value = "dealStatus")
private Integer dealStatus;
/**
* 创建人
*/
@TableField(value = "`createUser`")
private String createUser;
/**
* 创建时间
*/
@TableField(value = "createTime")
private Date createTime;
/**
* 更新人
*/
@TableField(value = "updateUser")
private String updateUser;
/**
* 更新时间
*/
@TableField(value = "updateTime")
private Date updateTime;
/**
* 验收人
*/
@TableField(value = "reviewUser")
private String reviewUser;
/**
* 验收时间
*/
@TableField(value = "auditTime")
private Date auditTime;
@TableField(value = "checkUser")
private String checkUser;
@TableField(value = "checkTime")
private Date checkTime;
/**
* ID
*/
@TableField(value = "customerId")
private String customerId;
/**
* 部门编码
*/
@TableField(value = "deptCode")
private String deptCode;
/**
* 仓库编码
*/
@TableField(value = "invCode")
private String invCode;
/**
* 单据流转
*/
@TableField(value = "outChangeEnable")
private Boolean outChangeEnable;
/**
* 单据流转上级单号
*/
@TableField(value = "originUllageSupNo")
private String originUllageSupNo;
/**
* 单据流转下级单号
*/
@TableField(value = "ullageSupNo")
private String ullageSupNo;
/**
* 平衡补单单号
*/
@TableField(value = "supplementNo")
private String supplementNo;
/**
* 第三方系统单号(提交后返回）
*/
@TableField(value = "thirdBillNo")
private String thirdBillNo;
/**
* 复制单据单号，多个单号之间使用,隔开
*/
@TableField(value = "replicateNo")
private String replicateNo;
/**
* 单据打印备注
*/
@TableField(value = "printRemark")
private String printRemark;
/**
* 单据备注
*/
@TableField(value = "remark")
private String remark;
@TableField(value = "errMsg")
private String errMsg;
@TableField(value = "preOutBillNo")
private String preOutBillNo;
@TableField(value = "preInBillNo")
private String preInBillNo;
@TableField(value = "entrustEnd")
private boolean entrustEnd;
@TableField(value = "reviewSp")
private boolean reviewSp; //是否验收外网单据时，需忽略流转更改为待审核
@TableField(value = "confirmUser")
private String confirmUser;
/**
* 单据类型：1.业务单据，2:扫码单据,3.正常处理单据 只有草稿，异常，待处理
*/
@TableField(value = "orderType")
private Integer orderType;
//单据同步状态
@TableField(value = "syncStatus")
private Integer syncStatus;
@TableField(value = "fromReceiveBillNo")
private String fromReceiveBillNo;
@TableField(value = "fromThrBillNo")
private String fromThrBillNo;
/**
* 导出状态/上传状态（0.未导出，1.已导出，2.导出失败）
*/
@TableField(value = "exportStatus")
private Integer exportStatus;
@TableField(value = "busType")
private Integer busType; //1:正常；2：送货；3.到货
@TableField(value = "deliveryStatus")
private Integer deliveryStatus; //单据送货验收状态
@TableField(value = "processStatus")
private Integer processStatus; //退货单据处理状态
@TableField(value = "inCodeStatus")
private Integer inCodeStatus; //内部码生成状态
@TableField(value = "relKey")
private String relKey; //关联单据唯一键
@TableField(value = "suppleCount")
private Integer suppleCount; //补单次数
@TableField(value = "checkStatus")
private Integer checkStatus; //确认状态
// 预验收按单出库，退货
@TableField(value = "checkPreInOrders")
private String checkPreInOrders;
// 预验收按货位出库，退货
@TableField(value = "checkPreInInvCode")
private String checkPreInInvCode;
// 预验收按货位出库，退货
@TableField(value = "checkPreInSpaceCode")
private String checkPreInSpaceCode;
// 当前货位
@TableField(value = "curSpaceCode")
private String curSpaceCode;
// 预验收、寄售当前货位
@TableField(value = "preCurSpaceCode")
private String preCurSpaceCode;
/**
* 出库病人信息
*/
@TableField(value = "outSickInfo")
private String outSickInfo;
@TableField(value = "fromSpmsOrders")
private String fromSpmsOrders;
/**
* 是否已被选入
*/
@TableField(value = "preInSelected")
private Integer preInSelected;
/**
* 病人住院号
*/
@TableField(value = "sickerAdNum")
private String sickerAdNum;
/**
* 往来患者code
*/
@TableField(value = "fromPatientCode")
private String fromPatientCode;
}
Write Preview
Loading…
Cancel
Save