feat: 码明细到国家同步库

dev_unify
chenhc 5 months ago
parent 359b0fb636
commit f31b78522c

@ -0,0 +1,33 @@
package com.glxp.api.controller.collect;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.http.ErpBasicClient;
import com.glxp.api.req.collect.PostCollectOrderRequest;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
@Slf4j
@RestController
public class IoCollectOrderBackupController {
@Resource
ErpBasicClient erpBasicClient;
/**
*
*
* @param postCollectOrderRequest
* @return
*/
@PostMapping("/sps/sync/collect/order/upload")
public BaseResponse orderUpload(@RequestBody PostCollectOrderRequest postCollectOrderRequest) {
return erpBasicClient.collectOrderUpload(postCollectOrderRequest);
}
}

@ -0,0 +1,162 @@
package com.glxp.api.entity.collect;
import lombok.Data;
import java.util.Date;
/**
*
*/
@Data
public class CollectOrderBizResponse {
private Long id;
/**
*
*/
private String orderIdFk;
/**
*
*/
private String thrCode;
/**
*
*/
private String ybbm;
/**
*
*/
private String payFeeCode;
/**
*
*/
private String cpmctymc;
/**
*
*/
private String nameCode;
/**
*
*/
private String ggxh;
/**
*
*/
private String batchNo;
/**
*
*/
private String productDate;
/**
*
*/
private String expireDate;
/**
*
*/
private Integer count;
/**
*
*/
private Integer actCount;
/**
*
*/
private Integer scanCount;
/**
*
*/
private Integer scanActCount;
/**
*
*/
private String measureUnit;
/**
* 1:23
*/
private Integer tagStatus;
/**
*
*/
private String tagMsg;
/**
*
*/
private String remark;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
/**
* UDI
*/
private String udiCode;
private Long relId;
private Integer unTagCount;
private String scanUdiCode;
private String splitUdiCode;
private String unSplitUdiCode;
private String finishUdiCode;
private String bzgg;
private Integer autoResCount;
private String replaceCode;
/**
* 123:
*/
private Integer autoTagStatus;
/**
*
*/
private Integer tempWorkPlaceCount;
/**
*
*/
private Integer tempSplitCount;
private String remark1;
private String remark2;
private String remark3;
private String remark4;
private String remark5;
private String remark6;
private String remark7;
private String remark8;
private String remark9;
private String remark10;
private boolean splitUnCheck;
}

@ -0,0 +1,144 @@
package com.glxp.api.entity.collect;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
@ApiModel(value = "com-glxp-api-entity-collect-IoCollectCode")
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "io_collect_code_backup")
public class IoCollectCodeBackup implements Serializable {
@TableId(value = "id", type = IdType.AUTO)
@ApiModelProperty(value = "")
private Integer id;
/**
* UDI.
*/
@TableField(value = "code")
@ApiModelProperty(value = "追溯码UDI.药品)")
private String code;
/**
*
*/
@TableField(value = "fromType")
@ApiModelProperty(value = "单据来源")
private String fromType;
/**
*
*/
@TableField(value = "busType")
@ApiModelProperty(value = "单据类型")
private String busType;
/**
*
*/
@TableField(value = "billNo")
@ApiModelProperty(value = "单据号")
private String billNo;
/**
*
*/
@TableField(value = "fromCorp")
@ApiModelProperty(value = "往来单位")
private String fromCorp;
/**
*
*/
@TableField(value = "operTime")
@ApiModelProperty(value = "操作时间")
private Date operTime;
/**
*
*/
@TableField(value = "operUser")
@ApiModelProperty(value = "操作人")
private String operUser;
/**
*
*/
@TableField(value = "collectCode")
@ApiModelProperty(value = "采集点")
private String collectCode;
/**
*
*/
@TableField(value = "collectUser")
@ApiModelProperty(value = "采集点负责人")
private String collectUser;
/**
*
*/
@TableField(value = "workPlaceCode")
@ApiModelProperty(value = "工位")
private Long workPlaceCode;
/**
*
*/
@TableField(value = "workPlaceUser")
@ApiModelProperty(value = "工位负责人")
private String workPlaceUser;
/**
*
*/
@TableField(value = "remark")
@ApiModelProperty(value = "备注")
private String remark;
/**
* 1:2:;3.
*/
@TableField(value = "fifoSplit")
@ApiModelProperty(value = "")
private Integer fifoSplit;
/**
* 12
*/
@TableField(value = "inoutType")
@ApiModelProperty(value = "出入库类型")
private Integer inoutType;
/**
*
*/
@TableField(value = "scanCount")
@ApiModelProperty(value = "出入库类型")
private Integer scanCount;
/**
* id
*/
@TableField(value = "relId")
@ApiModelProperty(value = "耗材字典外键id")
private Long relId;
private static final long serialVersionUID = 1L;
}

@ -0,0 +1,261 @@
package com.glxp.api.entity.collect;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
*
*/
@ApiModel(value = "com-glxp-api-entity-collect-IoCollectOrder")
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "io_collect_order_backup")
public class IoCollectOrderBackup implements Serializable {
@TableId(value = "id", type = IdType.INPUT)
@ApiModelProperty(value = "")
private Integer id;
/**
*
*/
@TableField(value = "billNo")
@ApiModelProperty(value = "单据号")
private String billNo;
/**
*
*/
@TableField(value = "busType")
@ApiModelProperty(value = "单据类型")
private String busType;
/**
*
*/
@TableField(value = "fromType")
@ApiModelProperty(value = "来源业务")
private String fromType;
/**
*
*/
@TableField(value = "fromTypeDesc")
@ApiModelProperty(value = "来源业务说明")
private String fromTypeDesc;
/**
*
*/
@TableField(value = "fromCorp")
@ApiModelProperty(value = "往来信息")
private String fromCorp;
/**
*
*/
@TableField(value = "fromCorpName")
@ApiModelProperty(value = "往来信息名称")
private String fromCorpName;
/**
*
*/
@TableField(value = "billTime")
@ApiModelProperty(value = "单据时间")
private Date billTime;
/**
*
*/
@TableField(value = "createTime")
@ApiModelProperty(value = "创建时间")
private Date createTime;
/**
*
*/
@TableField(value = "collectTime")
@ApiModelProperty(value = "采集时间")
private Date collectTime;
// /**
// * 采集点编码
// */
// @TableField(value = "collectCode")
// @ApiModelProperty(value = "采集点编码")
// private String collectCode;
/**
*
*/
@TableField(value = "workPlaceCode")
@ApiModelProperty(value = "工位编码")
private Long workPlaceCode;
/**
*
*/
@TableField(value = "remark")
@ApiModelProperty(value = "备注")
private String remark;
/**
*
*/
@TableField(value = "`createUser`")
@ApiModelProperty(value = "创建人")
private String createUser;
/**
*
*/
@TableField(value = "updateTime")
@ApiModelProperty(value = "更新时间")
private Date updateTime;
/**
*
*/
@TableField(value = "updateUser")
@ApiModelProperty(value = "更新人")
private Long updateUser;
/**
* 0:1:234,-1:稿5
*/
@TableField(value = "tagStatus")
private Integer tagStatus;
/**
* 012,3.
*/
@TableField(value = "splitStatus")
private Integer splitStatus;
/**
*
*/
@TableField(value = "splitMsg")
private String splitMsg;
/**
*
*/
@TableField(value = "tagMsg")
private String tagMsg;
/**
* 1:; 2:使
*/
@TableField(value = "orderCirType")
private Integer orderCirType;
/**
* 1
*/
@TableField(value = "backupOrderRemark1")
@ApiModelProperty(value = "单据备注1")
private String backupOrderRemark1;
/**
* 2
*/
@TableField(value = "backupOrderRemark2")
@ApiModelProperty(value = "单据备注2")
private String backupOrderRemark2;
/**
* 3
*/
@TableField(value = "backupOrderRemark3")
@ApiModelProperty(value = "单据备注3")
private String backupOrderRemark3;
/**
* 4
*/
@TableField(value = "backupOrderRemark4")
@ApiModelProperty(value = "单据备注4")
private String backupOrderRemark4;
/**
* 5
*/
@TableField(value = "backupOrderRemark5")
@ApiModelProperty(value = "单据备注5")
private String backupOrderRemark5;
/**
* 6
*/
@TableField(value = "backupOrderRemark6")
@ApiModelProperty(value = "单据备注6")
private String backupOrderRemark6;
/**
*
*/
@TableField(value = "orderTime")
@ApiModelProperty(value = "排序时间")
private Date orderTime;
/**
* 1:; 2:3:
*/
@TableField(value = "invAlert")
private Integer invAlert;
@TableField(exist = false)
private List<CollectOrderBizResponse> collectOrderBizResponseList;
@TableField(exist = false)
private List<IoCollectOrderBiz> bizList;
@TableField(exist = false)
private List<IoCollectCodeBackup> codeList;
/**
*
*/
@TableField(value = "errorMsg")
private String errorMsg;
/**
* (1.,2.,3.)
*/
@TableField(value = "uploadStatus")
private Integer uploadStatus;
/**
*
*/
@TableField(value = "uploadError")
private String uploadError;
@TableField(value = "shipper")
@ApiModelProperty(value = "发货方编码")
private String shipper;
@TableField(value = "shipperName")
@ApiModelProperty(value = "发货方名称")
private String shipperName;
@TableField(value = "thrBusType")
@ApiModelProperty(value = "第三方单据类型编码")
private String thrBusType;
private static final long serialVersionUID = 1L;
}

@ -0,0 +1,277 @@
package com.glxp.api.entity.collect;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
*
*/
@ApiModel(value = "com-glxp-api-entity-collect-IoCollectOrderBiz")
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "io_collect_order_biz")
public class IoCollectOrderBiz implements Serializable {
@TableId(value = "id", type = IdType.AUTO)
@ApiModelProperty(value = "")
private Long id;
/**
*
*/
@TableField(value = "orderIdFk")
private String orderIdFk;
/**
* ID
*/
@TableField(value = "relId")
@ApiModelProperty(value = "耗材字典ID")
private Long relId;
/**
*
*/
@TableField(value = "thrCode")
@ApiModelProperty(value = "院内编码(第三方编码)")
private String thrCode;
/**
*
*/
@TableField(value = "ybbm")
@ApiModelProperty(value = "医保编码")
private String ybbm;
/**
*
*/
@TableField(value = "sptm")
@ApiModelProperty(value = "商品条码")
private String sptm;
/**
*
*/
@TableField(value = "payFeeCode")
@ApiModelProperty(value = "收费编码")
private String payFeeCode;
/**
*
*/
@TableField(value = "cpmctymc")
@ApiModelProperty(value = "产品通用名称")
private String cpmctymc;
/**
*
*/
@TableField(value = "nameCode")
@ApiModelProperty(value = "产品标识")
private String nameCode;
/**
*
*/
@TableField(value = "ggxh")
@ApiModelProperty(value = "规格型号")
private String ggxh;
/**
*
*/
@TableField(value = "batchNo")
@ApiModelProperty(value = "批次号")
private String batchNo;
/**
*
*/
@TableField(value = "productDate")
@ApiModelProperty(value = "生产日期")
private String productDate;
/**
*
*/
@TableField(value = "expireDate")
@ApiModelProperty(value = "失效日期")
private String expireDate;
/**
*
*/
@TableField(value = "`count`")
@ApiModelProperty(value = "单据数量")
private Integer count;
/**
*
*/
@TableField(value = "actCount")
@ApiModelProperty(value = "实际数量")
private Integer actCount;
/**
*
*/
@TableField(value = "scanCount")
@ApiModelProperty(value = "扫码数量")
private Integer scanCount;
/**
*
*/
@TableField(value = "scanActCount")
@ApiModelProperty(value = "扫码实际数量")
private Integer scanActCount;
/**
*
*/
@TableField(value = "measureUnit")
@ApiModelProperty(value = "计量单位")
private String measureUnit;
/**
* 1:23
*/
@TableField(value = "tagStatus")
@ApiModelProperty(value = "单据明细赋码状态 1:未赋码2部分赋码3已赋码")
private Integer tagStatus;
/**
*
*/
@TableField(value = "tagMsg")
@ApiModelProperty(value = "赋码错误信息")
private String tagMsg;
/**
*
*/
@TableField(value = "remark")
@ApiModelProperty(value = "备注")
private String remark;
/**
*
*/
@TableField(value = "createTime")
@ApiModelProperty(value = "创建时间")
private Date createTime;
/**
*
*/
@TableField(value = "updateTime")
@ApiModelProperty(value = "更新时间")
private Date updateTime;
/**
*
*/
@TableField(value = "unTagCount")
@ApiModelProperty(value = "未拆零数量")
private Integer unTagCount;
/**
*
*/
@TableField(value = "autoResCount")
@ApiModelProperty(value = "自动扫描分配的工位存量")
private Integer autoResCount;
/**
*
*/
@TableField(value = "replaceCode")
@ApiModelProperty(value = "上传替换码")
private String replaceCode;
/**
* 123:
*/
@TableField(value = "autoTagStatus")
@ApiModelProperty(value = "autoTagStatus")
private Integer autoTagStatus;
/**
*
*/
@TableField(value = "tempWorkPlaceCount")
@ApiModelProperty(value = "tempWorkPlaceCount")
private Integer tempWorkPlaceCount;
/**
*
*/
@TableField(value = "splitUnCheck")
@ApiModelProperty(value = "splitUnCheck")
private boolean splitUnCheck;
/**
*
*/
@TableField(value = "tempSplitCount")
@ApiModelProperty(value = "tempSplitCount")
private Integer tempSplitCount;
@TableField(value = "searchRemark1")
@ApiModelProperty(value = "searchRemark1")
private String searchRemark1;
@TableField(value = "searchRemark2")
@ApiModelProperty(value = "searchRemark2")
private String searchRemark2;
@TableField(value = "searchRemark3")
@ApiModelProperty(value = "searchRemark3")
private String searchRemark3;
@TableField(value = "searchRemark4")
@ApiModelProperty(value = "searchRemark4")
private String searchRemark4;
@TableField(value = "searchRemark5")
@ApiModelProperty(value = "searchRemark5")
private String searchRemark5;
@TableField(value = "remark1")
private String remark1;
@TableField(value = "remark2")
private String remark2;
@TableField(value = "remark3")
private String remark3;
@TableField(value = "remark4")
private String remark4;
@TableField(value = "remark5")
private String remark5;
@TableField(value = "remark6")
private String remark6;
@TableField(value = "remark7")
private String remark7;
@TableField(value = "remark8")
private String remark8;
@TableField(value = "remark9")
private String remark9;
@TableField(value = "remark10")
private String remark10;
private static final long serialVersionUID = 1L;
}

@ -11,6 +11,7 @@ import com.glxp.api.http.req.UdiwmsBusTypeRequest;
import com.glxp.api.http.req.UdiwmsUnitRequest;
import com.glxp.api.req.basic.YbDrugDetailFilterRequest;
import com.glxp.api.req.basic.YbHcflDetailFilterRequest;
import com.glxp.api.req.collect.PostCollectOrderRequest;
import com.glxp.api.req.thrsys.*;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.chs.YbHcflEntityResponse;
@ -268,4 +269,23 @@ public class ErpBasicClient {
}
}
/**
*
* @param postCollectOrderRequest
* @return
*/
public BaseResponse collectOrderUpload(PostCollectOrderRequest postCollectOrderRequest) {
String url = "https://www.udims.com/UDI_DL_Server_test"+ "/collect/order/upload";
try {
String response = httpOkClient.uCloudPost(url, postCollectOrderRequest);
BaseResponse listBaseResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
});
return listBaseResponse;
} catch (Exception e) {
log.error("上传已成功传输医保的完成单据", e);
return ResultVOUtils.error(500, "连接第三方系统接口服务出错");
}
}
}

@ -0,0 +1,17 @@
package com.glxp.api.req.collect;
import com.glxp.api.entity.collect.IoCollectOrderBackup;
import lombok.Data;
import java.util.List;
@Data
public class PostCollectOrderRequest {
private String thirdSys;
private String webTitle;
List<IoCollectOrderBackup> collectOrderList;
}
Loading…
Cancel
Save