退货补单，多级仓库补单修改，新增灭菌批号，灭菌日期

src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java

@@ -151,7 +151,7 @@ public class IoOrderDetailResultController extends BaseController {
         response.setHeader("Content-Disposition",
                 "attachment;filename=" + URLEncoder.encode("出入库明细" + DateUtil.format(new Date(), "yyyy-MM-dd") + ".xlsx", StandardCharsets.UTF_8.name()));
 
-        EasyExcel.write(response.getOutputStream(), IoOrderDetailResultResponse.class).sheet().doWrite(orderDetailVos);
+        EasyExcel.write(response.getOutputStream(), IoOrderDetailVo.class).sheet().doWrite(orderDetailVos);
     }
 
 
@@ -165,7 +165,7 @@ public class IoOrderDetailResultController extends BaseController {
         response.setHeader("Content-Disposition",
                 "attachment;filename=" + URLEncoder.encode("出入库明细" + DateUtil.format(new Date(), "yyyy-MM-dd") + ".xlsx", StandardCharsets.UTF_8.name()));
 
-        EasyExcel.write(response.getOutputStream(), IoOrderDetailResultResponse.class).sheet().doWrite(orderDetailVos);
+        EasyExcel.write(response.getOutputStream(), IoOrderDetailVo.class).sheet().doWrite(orderDetailVos);
     }
 
 

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

@@ -196,6 +196,19 @@ public class IoOrderDetailBizEntity {
     private String checkColdFileName;
 
 
+    /**
+     * 灭菌批号
+     */
+    @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/IoOrderDetailCodeEntity.java

@@ -189,6 +189,18 @@ public class IoOrderDetailCodeEntity {
     @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

@@ -190,6 +190,18 @@ public class IoOrderDetailResultEntity {
     @TableField(value = "inoutPrintStatus")
     private Integer inoutPrintStatus;
 
+    /**
+     * 灭菌批号
+     */
+    @TableField(value = "sterBatchNo")
+    private String sterBatchNo;
+
+    /**
+     * 灭菌日期
+     */
+    @TableField(value = "sterDate")
+    private String sterDate;
+
     @TableField(exist = false)
     private String deptCode;
     @TableField(exist = false)

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

@@ -1,5 +1,6 @@
 package com.glxp.api.res.inout;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -151,6 +152,15 @@ public class IoOrderDetailBizResponse {
      * 扩展字段5
      */
     private String remark5;
+    /**
+     * 灭菌批号
+     */
+    private String sterBatchNo;
+
+    /**
+     * 灭菌日期
+     */
+    private String sterDate;
 
     //扫码数量
     private int scanCount;
@@ -174,7 +184,4 @@ public class IoOrderDetailBizResponse {
     private String zczbhhzbapzbh;
 
 
-
-
-
 }

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

@@ -1,5 +1,6 @@
 package com.glxp.api.res.inout;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -159,6 +160,16 @@ public class IoOrderDetailCodeResponse {
      */
     private String supName;
 
+    /**
+     * 灭菌批号
+     */
+    private String sterBatchNo;
+
+    /**
+     * 灭菌日期
+     */
+    private String sterDate;
+
     private int orderCount;
 
     private String invoiceCodes;

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

@@ -170,6 +170,18 @@ public class IoOrderDetailResultResponse {
      * 扩展字段5
      */
     private String remark5;
+
+
+    /**
+     * 灭菌批号
+     */
+    private String sterBatchNo;
+
+    /**
+     * 灭菌日期
+     */
+    private String sterDate;
+
     private int acceptCount;
     private String fromCorpName;
     @ExcelProperty(value = "单据类型", index = 9)

src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java

@@ -240,7 +240,8 @@ public class IoChangeInoutService {
                 }
                 if (StrUtil.isNotEmpty(bussinessChangeTypeEntity.getDefaultInvCode())) {
                     outOrder.setFromInvCode(bussinessChangeTypeEntity.getDefaultInvCode());
-                    outOrder.setFromDeptCode(bussinessChangeTypeEntity.getDefaultDeptCode());
+                    InvWarehouseEntity fromInv = invWarehouseService.findByInvSubByCode(bussinessChangeTypeEntity.getDefaultInvCode());
+                    outOrder.setFromDeptCode(fromInv.getParentId());
                 }
                 //原先流程---使用流转单据默认仓库
 //                outOrder.setFromInvCode(bussinessChangeTypeEntity.getDefaultInvCode());
@@ -305,8 +306,13 @@ public class IoChangeInoutService {
 
             //根据单据设置状态 1:草稿
             if (bussinessChangeTypeEntity.getAuditStatus() == 1) {
-                orderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE);
+                outOrder.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE);
-                orderService.update(orderEntity);
+                orderService.update(outOrder);
+
+                for (IoCodeTempEntity codeTempEntity : codeTempEntities) {
+                    addInoutService.genOrderDetailCode(orderEntity, codeTempEntity);
+                }
+
             } else if (bussinessChangeTypeEntity.getAuditStatus() == 2 || bussinessChangeTypeEntity.getAuditStatus() == 3) {
                 addInoutService.dealProcess(outOrder);
                 if (!ioCheckInoutService.checkManual(outOrder.getBillNo())) {

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -66,7 +66,6 @@ import java.util.stream.Collectors;
 
 @Slf4j
 @Service
-@Transactional(rollbackFor = Exception.class)
 public class IoOrderServiceImpl implements IoOrderService {
 
     @Resource

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

@@ -89,3 +89,13 @@ 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);
 
+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);
+
+