单据新增灭菌日期灭菌批号

src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java

@@ -134,6 +134,7 @@ public class BasicOrderPrintController {
                     Map<String, Object> bizData = new HashMap<>();
                     bizData.put("index", i);
                     bizData.put("corpName", ioOrderResponse.getFromName() == null ? ' ' : ioOrderResponse.getFromName());
+                    bizData.put("orderRemark", ioOrderResponse.getRemark() == null ? ' ' : ioOrderResponse.getRemark());
                     bizData.put("locInv", ioOrderResponse.getInvName() == null ? ' ' : ioOrderResponse.getInvName());
                     bizData.put("billNo", ioOrderResponse.getBillNo() == null ? ' ' : ioOrderResponse.getBillNo());
                     bizData.put("billdate", formatter.format(ioOrderResponse.getCreateTime()));
@@ -226,6 +227,7 @@ public class BasicOrderPrintController {
                     bizData.put("expireDate", ioOrderDetailBizEntity.getExpireDate());
                     bizData.put("manufactor", ioOrderDetailBizEntity.getManufacturer());
                     bizData.put("zczbhhzbapzbh", ioOrderDetailBizEntity.getCertCode() == null ? ' ' : ioOrderDetailBizEntity.getCertCode());
+                    bizData.put("orderRemark", ioOrderResponse.getRemark() == null ? ' ' : ioOrderResponse.getRemark());
 
                     if (IntUtil.value(printThird) == 1) {
                         UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(obj.getRelId());

src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java

@@ -174,6 +174,19 @@ public class IoOrderDetailBizEntity {
     @TableField(value = "remark5")
     private String remark5;
 
+
+    /**
+     * 灭菌批号
+     */
+    @TableField(value = "sterBatchNo")
+    private String sterBatchNo;
+
+    /**
+     * 灭菌日期
+     */
+    @TableField(value = "sterDate")
+    private String sterDate;
+
     @TableField(value = "bindRlIds")
     private String bindRlIds;
 
@@ -196,8 +209,6 @@ public class IoOrderDetailBizEntity {
     private String checkColdFileName;
 
 
-
-
     @TableField(exist = false)
     private boolean checkSuccess;
 

src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java

@@ -191,6 +191,18 @@ public class IoOrderDetailCodeEntity implements Serializable {
     @TableField(value = "remark5")
     private String remark5;
 
+    /**
+     * 灭菌批号
+     */
+    @TableField(value = "sterBatchNo")
+    private String sterBatchNo;
+
+    /**
+     * 灭菌日期
+     */
+    @TableField(value = "sterDate")
+    private String sterDate;
+
     @TableField(exist = false)
     private boolean checkSuccess;
 

src/main/java/com/glxp/api/entity/inout/IoOrderDetailResultEntity.java

@@ -182,4 +182,17 @@ public class IoOrderDetailResultEntity {
     @TableField(value = "remark5")
     private String remark5;
 
+    /**
+     * 灭菌批号
+     */
+    @TableField(value = "sterBatchNo")
+    private String sterBatchNo;
+
+    /**
+     * 灭菌日期
+     */
+    @TableField(value = "sterDate")
+    private String sterDate;
+
+
 }

src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java

@@ -151,7 +151,15 @@ public class IoOrderDetailBizResponse {
      * 扩展字段5
      */
     private String remark5;
+    /**
+     * 灭菌批号
+     */
+    private String sterBatchNo;
 
+    /**
+     * 灭菌日期
+     */
+    private String sterDate;
     //扫码数量
     private int scanCount;
 
@@ -174,5 +182,4 @@ public class IoOrderDetailBizResponse {
     private String checkColdFileName;
 
 
-
 }

src/main/java/com/glxp/api/res/inout/IoOrderDetailCodeResponse.java

@@ -154,7 +154,15 @@ public class IoOrderDetailCodeResponse {
     private String remark5;
 
     private boolean checkSuccess;
+    /**
+     * 灭菌批号
+     */
+    private String sterBatchNo;
 
+    /**
+     * 灭菌日期
+     */
+    private String sterDate;
     /**
      * 供应商名称
      */

src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java

@@ -156,6 +156,17 @@ public class IoOrderDetailResultResponse {
      * 扩展字段5
      */
     private String remark5;
+
+    /**
+     * 灭菌批号
+     */
+    private String sterBatchNo;
+
+    /**
+     * 灭菌日期
+     */
+    private String sterDate;
+
     private int acceptCount;
     private String fromCorpName;
     private String billTypeName;
@@ -163,7 +174,6 @@ public class IoOrderDetailResultResponse {
     private Date auditTime;
 
 
-
     private int orderCount;
 
     private String invoiceCodes;

src/main/resources/schemas/schema_v2.3.sql

@@ -663,5 +663,35 @@ INSERT ignore INTO sys_param_config(`id`, `parentId`, `paramName`, `paramKey`, `
                                     `paramType`, `paramExplain`, `updateTime`)
 VALUES (20088, 0, '单据详情展示方式', 'order_detail_visible', '1', 0, 0, '1:按DI统一排序2：按扫码或录入时间排序', NULL);
 
+CREATE TABLE IF NOT EXISTS `sys_msg_todo`
+(
+    `id`         int                                                           NOT NULL AUTO_INCREMENT,
+    `code`       varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '消息编码',
+    `msgType`    tinyint                                                       NULL DEFAULT NULL COMMENT '消息类型（1:入院物资申请；2:单据审核；3：单据发票确认；5.资质审核;6：领用单审核；7:申购单审核；8：采购订单审核；）',
+    `msgContent` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '消息内容',
+    `dealStatus` tinyint                                                       NULL DEFAULT NULL COMMENT '处理状态',
+    `pushStatus` tinyint                                                       NULL DEFAULT NULL COMMENT '推送小程序状态（1：未推送；2:推送成功；3：推送失败',
+    `toUrl`      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '跳转地址',
+    `createTime` datetime(0)                                                   NULL DEFAULT NULL COMMENT '创建时间',
+    `updateUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人',
+    `updateTime` datetime(0)                                                   NULL DEFAULT NULL COMMENT '更新时间',
+    `deptCode`   varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '所属仓库',
+    `invCode`    varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '所属仓库',
+    `remark`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 1
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci
+  ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'sterBatchNo', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'sterDate', 'varchar(255)', 1);
 
+CALL Pro_Temp_ColumnWork('io_order_detail_code', 'sterBatchNo', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('io_order_detail_code', 'sterDate', 'varchar(255)', 1);
 
+CALL Pro_Temp_ColumnWork('io_order_detail_result', 'sterBatchNo', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('io_order_detail_result', 'sterDate', 'varchar(255)', 1);