6/4 优化发票确认时间以及相关带票查询

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

@@ -1011,6 +1011,7 @@ public class IoOrderController extends BaseController {
         ioOrderEntity.setUpdateTime(new Date());
         ioOrderEntity.setUpdateUser(getUserId() + "");
         ioOrderEntity.setConfirmUser(getUserId() + "");
+        ioOrderEntity.setConfirmTime(new Date());
 
         if (IntUtil.value(ioOrderEntity.getCheckStatus()) != 0) {
             ioOrderEntity.setConfirmTime(new Date());

src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java

@@ -58,4 +58,6 @@ public class FilterOrderDetailResultRequest extends ListPageRequest {
     private String employeeName;
     private String fromInvName;
     private String locInvName;
+    private String confirmStarTime;  //发票确认起始日期
+    private String confirmEndTime;   //发票确认结束日期
 }

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

@@ -211,6 +211,9 @@ public class IoOrderDetailResultResponse {
     //金额
     private BigDecimal amount;
 
+    @ExcelProperty(value = "发票确认时间", index = 12)
+    private Date confirmTime;
+
 
     public String getFromName() {
         if (StrUtil.isNotEmpty(fromCorpName))

src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml

@@ -26,6 +26,7 @@
     <select id="filterOrderList" resultType="com.glxp.api.res.inout.IoOrderDetailResultResponse">
         SELECT a2.*,
                a1.mainAction,
+               a1.confirmTime as confirmTime,
                a1.auditTime,
                b1.NAME                                                             AS   fromCorpName,
                (select name from auth_warehouse aw where aw.code = a1.fromInvCode) as   fromInvName,
@@ -77,6 +78,9 @@
             <if test="startAduditTime != null and startAduditTime != '' and endAduditTime != null and endAduditTime != ''">
                 AND date_format(a1.auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and date_format(#{endAduditTime}, '%Y-%m-%d')
             </if>
+            <if test="confirmStarTime != null and confirmStarTime != '' and confirmEndTime != null and confirmEndTime != ''">
+                AND date_format(a1.confirmTime, '%Y-%m-%d') between date_format(#{confirmStarTime}, '%Y-%m-%d') and date_format(#{confirmEndTime}, '%Y-%m-%d')
+            </if>
             <if test="batchNo != null and batchNo != ''">
                 AND a2.batchNo like concat('%', #{batchNo}, '%')
             </if>

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

@@ -3397,6 +3397,10 @@ ALTER TABLE  device_plan_detail_item
     DROP PRIMARY KEY,
     ADD PRIMARY KEY (`planId`, `productId`, `itemCode`, `deviceCode`) USING BTREE;
 
+CALL Pro_Temp_ColumnWork('sync_data_set', 'deviceUpkeep',
+                         ' tinyint  NULL DEFAULT NULL COMMENT ''保养单''',
+                         1);
+
 INSERT IGNORE INTO sys_pdf_template(`id`, `name`, `type`, `module`, `param`, `path`, `rowCount`, `qrcodeCount`, `remark`, `create_time`, `update_time`, `jrxmlPath`,
                              `bussinessType`, `bussinessStatus`) VALUES (4, '设备标签模板', 2, 0, '', '7bdc497e-b0e4-444d-be63-cc27978568ea.jasper', 10,
                                                                          1, '', '2024-05-21 16:24:56', '2024-05-21 16:24:56', '2427d70b-2b69-483f-9a9d-7c9c4a3c688e.jrxml', NULL, NULL);
@@ -3685,3 +3689,5 @@ CREATE TABLE IF NOT EXISTS `thr_medical_product_category` (
 CALL Pro_Temp_ColumnWork('basic_products', 'requireScanCode',
                          'bit(1) NOT NULL DEFAULT b''0'' COMMENT ''是否需要扫码 1是；0否''',
                          1);
+
+INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (41779, 94, '2', 1, 'confirmDateRange', '发票确认时间', 'datePickera', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);