转换为单据

src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java

@@ -1456,7 +1456,7 @@ public class CtqyyClient extends CommonHttpClient {
 
 
     /**
-     * 中间表
+     *
      * @param udiwmsBasicSkPrescribeRequest
      * @return
      */
@@ -1506,7 +1506,7 @@ public class CtqyyClient extends CommonHttpClient {
     }
 
     /**
-     * 单据
+     * 视图转为单据
      * @param udiwmsBasicSkPrescribeRequest
      * @return
      */
@@ -1521,7 +1521,6 @@ public class CtqyyClient extends CommonHttpClient {
                 VYpzsPresInfo presInfoEntity = value.get(0);
                 IoCollectOrder ioCollectOrder = new IoCollectOrder();
                 ioCollectOrder.setBillNo(presInfoEntity.getPRESCRIBE_NUMBER());
-                ioCollectOrder.setBusType(udiwmsBasicSkPrescribeRequest.getDocumentTypeCode());
                 ioCollectOrder.setFromType("HIS系统");
                 ioCollectOrder.setFromCorp(presInfoEntity.getSICK_ID());
                 ioCollectOrder.setWorkPlaceCode(Long.valueOf(udiwmsBasicSkPrescribeRequest.getWorkPlaceCode()));
@@ -1531,33 +1530,27 @@ public class CtqyyClient extends CommonHttpClient {
                 ioCollectOrder.setCreateUser(udiwmsBasicSkPrescribeRequest.getCreateUser());
                 ioCollectOrder.setBackupOrderRemark1(presInfoEntity.getSTOOUT_NO());
                 ioCollectOrder.setUpdateTime(new Date());
-                ioCollectOrder.setOrderCirType(udiwmsBasicSkPrescribeRequest.getOrderCirType());
                 ioCollectOrder.setSplitStatus(0);
                 ioCollectOrder.setTagStatus(0);
-                List<CollectOrderBizResponse> detailList = new ArrayList<>();
+                List<IoCollectOrderBiz> bizList = new ArrayList<>();
                 value.forEach(entity ->
                 {
-                    CollectOrderBizResponse collectOrderBizResponse = new CollectOrderBizResponse();
-                    BasicUdirelEntity basicUdirel = new BasicUdirelEntity();
-                    basicUdirel.setMainId(entity.getPHYSIC_CODE());
-                    UdiRelevanceResponse udiRelevanceResponse = basicUdirelDao.selectOneUdi(basicUdirel);
-                    if (udiRelevanceResponse != null) {
-                        collectOrderBizResponse.setRelId(udiRelevanceResponse.getId());
-                        collectOrderBizResponse.setYbbm(udiRelevanceResponse.getYbbm());
-                        collectOrderBizResponse.setPayFeeCode(udiRelevanceResponse.getPayFeeCode());
-                        collectOrderBizResponse.setNameCode(udiRelevanceResponse.getNameCode());
+                    IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz();
+                    BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectOne(new LambdaQueryWrapper<BasicUdirelEntity>().eq(BasicUdirelEntity::getMainId, entity.getPHYSIC_CODE()));
+                    if (basicUdirelEntity != null) {
+                        collectOrderBiz.setRelId(basicUdirelEntity.getId());
                     }
-                    collectOrderBizResponse.setThrCode(entity.getPHYSIC_CODE());
-                    collectOrderBizResponse.setCpmctymc(entity.getPHYSIC_NAME());
-                    collectOrderBizResponse.setGgxh(entity.getPACK_SPEC());
-                    collectOrderBizResponse.setBatchNo("");
-                    collectOrderBizResponse.setCount(Integer.parseInt(entity.getLAY_PHYSIC_QUANTITY()));
-                    collectOrderBizResponse.setMeasureUnit(entity.getPHYSIC_UNIT());
-                    collectOrderBizResponse.setTagStatus(1);
-                    collectOrderBizResponse.setUnTagCount(0);
-                    detailList.add(collectOrderBizResponse);
+                    collectOrderBiz.setThrCode(entity.getPHYSIC_CODE());
+                    collectOrderBiz.setCpmctymc(entity.getPHYSIC_NAME());
+                    collectOrderBiz.setGgxh(entity.getPACK_SPEC());
+                    collectOrderBiz.setBatchNo("");
+                    collectOrderBiz.setCount(Integer.parseInt(entity.getLAY_PHYSIC_QUANTITY()));
+                    collectOrderBiz.setMeasureUnit(entity.getPHYSIC_UNIT());
+                    collectOrderBiz.setTagStatus(1);
+                    collectOrderBiz.setUnTagCount(0);
+                    bizList.add(collectOrderBiz);
                 });
-                ioCollectOrder.setCollectOrderBizResponseList(detailList);
+                ioCollectOrder.setBizList(bizList);
                 ioCollectOrders.add(ioCollectOrder);
             });
             PageSimpleResponse<IoCollectOrder> pageSimpleResponse = new PageSimpleResponse<>();

src/main/java/com/glxp/mipsdl/entity/inout/IoCollectOrder.java

@@ -192,5 +192,8 @@ public class IoCollectOrder implements Serializable {
     @TableField(exist = false)
     private List<CollectOrderBizResponse> collectOrderBizResponseList;
 
+    @TableField(exist = false)
+    private List<IoCollectOrderBiz> bizList;
+
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/mipsdl/entity/inout/IoCollectOrderBiz.java

@@ -0,0 +1,181 @@
+package com.glxp.mipsdl.entity.inout;
+
+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 lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 采集点单据详情
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "io_collect_order_biz")
+public class IoCollectOrderBiz implements Serializable {
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+    /**
+     * 单据号外键
+     */
+    @TableField(value = "orderIdFk")
+    private String orderIdFk;
+
+
+    /**
+     * 耗材字典ID
+     */
+    @TableField(value = "relId")
+    private Long relId;
+
+
+    /**
+     * 院内编码（第三方编码）
+     */
+    @TableField(value = "thrCode")
+    private String thrCode;
+
+    /**
+     * 医保编码
+     */
+    @TableField(value = "ybbm")
+    private String ybbm;
+
+    /**
+     * 收费编码
+     */
+    @TableField(value = "payFeeCode")
+    private String payFeeCode;
+
+    /**
+     * 产品通用名称
+     */
+    @TableField(value = "cpmctymc")
+    private String cpmctymc;
+
+    /**
+     * 产品标识
+     */
+    @TableField(value = "nameCode")
+    private String nameCode;
+
+    /**
+     * 规格型号
+     */
+    @TableField(value = "ggxh")
+    private String ggxh;
+
+    /**
+     * 批次号
+     */
+    @TableField(value = "batchNo")
+    private String batchNo;
+
+    /**
+     * 生产日期
+     */
+    @TableField(value = "productDate")
+    private String productDate;
+
+    /**
+     * 失效日期
+     */
+    @TableField(value = "expireDate")
+    private String expireDate;
+
+    /**
+     * 单据数量
+     */
+    @TableField(value = "`count`")
+    private Integer count;
+
+    /**
+     * 实际数量
+     */
+    @TableField(value = "actCount")
+    private Integer actCount;
+
+    /**
+     * 扫码数量
+     */
+    @TableField(value = "scanCount")
+    private Integer scanCount;
+
+    /**
+     * 扫码实际数量
+     */
+    @TableField(value = "scanActCount")
+    private Integer scanActCount;
+
+    /**
+     * 计量单位
+     */
+    @TableField(value = "measureUnit")
+    private String measureUnit;
+
+    /**
+     * 单据明细赋码状态  1:未赋码；2：部分赋码；3：已赋码
+     */
+    @TableField(value = "tagStatus")
+    private Integer tagStatus;
+
+    /**
+     * 赋码错误信息
+     */
+    @TableField(value = "tagMsg")
+    private String tagMsg;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime")
+    private Date updateTime;
+
+    /**
+     * 未拆零数量
+     */
+    @TableField(value = "unTagCount")
+    private Integer unTagCount;
+
+
+    /**
+     * 自动扫描分配的工位存量 锁数量
+     */
+    @TableField(value = "autoResCount")
+    private Integer autoResCount;
+
+    /**
+     * 上传替换码
+     */
+    @TableField(value = "replaceCode")
+    private String replaceCode;
+
+    /**
+     * 自动赋码状态：1：无法自动赋码；2：可以自动赋码；3:可以自动赋码，但是数量不足
+     */
+    @TableField(value = "autoTagStatus")
+    private Integer autoTagStatus;
+
+
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java

@@ -113,13 +113,5 @@ public class UdiwmsBasicSkPrescribeRequest extends ListPageRequest {
     private String addr;
 
     private String stooutNo;
-
-    /**
-     * 单据流通方式： 1:配送流通; 2:出库使用
-     */
-    private Integer orderCirType;
-
-    //单据编码
-    private String documentTypeCode;
 }