Merge remote-tracking branch 'origin/dev2.0' into dev2.0

# Conflicts:
#	src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java
#	src/main/resources/application-dev.yml

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

@@ -623,7 +623,7 @@ public class IoOrderReviewController extends BaseController {
      * PDA获取待核对单据-单据条码明细
      */
     @AuthRuleAnnotation("")
-    @GetMapping("/udiwms/pda/order/check/getOrderDetail1")
+    @GetMapping("/udiwms/pda/order/check/getCodes")
     public BaseResponse getPdaCheckOrderCodes(PdaCheckRequest pdaCheckRequest) {
         FilterOrderDetailResultRequest filterOrderDetailResultRequest = new FilterOrderDetailResultRequest();
         filterOrderDetailResultRequest.setOrderIdFk(pdaCheckRequest.getBillNo());

src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java

@@ -86,6 +86,13 @@ public class DeviceInspectTakeController {
          return ResultVOUtils.success(deviceInspectTaskEntity);
     }
 
+    @PostMapping("/udiwms/inv/device/inspect/take/delectDeviceInspecTake")
+    public BaseResponse delectDeviceInspecTake(@RequestBody  DeviceInspectTaskEntity deviceInspectTaskEntity) {
+
+        deviceInspectTaskService.delectDeviceInspectTask(deviceInspectTaskEntity);
+        return ResultVOUtils.success(deviceInspectTaskEntity);
+    }
+
 
 
 

src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskEntity.java

@@ -11,7 +11,7 @@ import java.util.Date;
 
 @Data
 @TableName(value = "device_inspect_task")
-public class DeviceInspectTaskEntity implements Serializable {
+public class DeviceInspectTaskEntity{
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 

src/main/java/com/glxp/api/service/inv/DeviceInspectTaskService.java

@@ -25,6 +25,11 @@ public class DeviceInspectTaskService extends ServiceImpl<DeviceInspectTaskMappe
        return true;
     }
 
+    public Boolean delectDeviceInspectTask(DeviceInspectTaskEntity deviceInspectTaskEntity){
+        deviceInspectTaskMapper.deleteById(deviceInspectTaskEntity);
+        return true;
+    }
+
 
 
     public List<DeviceInspectTakeResponse> filterList(FilterDeviceInspectTakeRequest filterDeviceInspectTakeRequest) {

src/main/java/com/glxp/api/upload/uploadController.java

@@ -25,6 +25,10 @@ public class uploadController {
 
     @Value("${file_path}")
     private String filePath;
+    @Value("${file_url}")
+    private String fileUrl;
+    @Value("${file_lpath}")
+    private String fileLpath;
 
     /**
      * 上传PDF模板
@@ -117,6 +121,7 @@ public class uploadController {
         }
         String newName = UUID.randomUUID() + fileType;//生成新文件名
         String savePath = filePath + "/register/" + type;
+        String savePath1 = fileLpath + "?type=" + type;
 
         File file1 = new File(savePath);
         if (!file1.exists()) {// 判断目录是否存在
@@ -127,7 +132,7 @@ public class uploadController {
             file.transferTo(file1);
             Map<String, String> rMap = new HashMap<>();
             rMap.put("msg", "上传成功");
-            rMap.put("name", newName);
+            rMap.put("name", fileUrl + savePath1 + "&name=" + newName);
             rMap.put("type", type);
             return ResultVOUtils.success(rMap);
         } catch (IOException e) {

src/main/resources/application-dev.yml

@@ -1,14 +1,12 @@
 server:
   port: 9991
-  #udi_wms_0710  udi_wms_zs  192.168.0.153  192.168.0.66:3364/udi_wms_0710
+
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_pzh?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_wms_0710?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: Glxp@6066
-#    password: 259415
-#    password: root
     hikari:
       connection-timeout: 60000
       maximum-pool-size: 20
@@ -48,13 +46,15 @@ logging:
   level:
     com.glxp.api.dao: debug
 
-file_path: E:/udi/inUdiwms/udiwmsfile/
+file_path: D:/udi/udiwms/udiwmsfile/
+file_lpath: /udiwms/image/register/file/getImage
+file_url: http://127.0.0.1:9991
 UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df
 UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test
 SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs
 
-back_file_path: E:/share/udisps/back/
+back_file_path: D:/share/udisps/back/
 API_KEY: 1101
-API_SECRET: zBITspLNvuoEd4FaamlSoqxRHmNsmQ9L
+API_SECRET: zBITspLNvuoEd4FaamlSoqxRHmNsmQ6L
 WEB_TITLE: 平潭协和医院
 SPMS_WEBSOCKET_TOKEN: 07rKFDFkQvBkbxgc7aUBlONo4gWNdx8b

src/main/resources/mybatis/mapper/inv/DeviceProjectSetMapper.xml

@@ -35,7 +35,7 @@
         AND content like concat('%',#{content},'%')
       </if>
       <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-        AND date_format(udpateTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and
+        AND date_format(createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and
         date_format(#{endTime}, '%Y-%m-%d')
       </if>
 

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

@@ -18,6 +18,8 @@ CREATE TABLE IF NOT EXISTS `device_inspect_task`
     `createTime`    datetime(0)                                                   NULL DEFAULT NULL COMMENT '创建时间',
     `updateTime`    datetime(0)                                                   NULL DEFAULT NULL COMMENT '更新时间',
     `expectedTime`  datetime(0)                                                   NULL DEFAULT NULL COMMENT '预期结束时间',
+    `repairType`    int                                                           NULL DEFAULT NULL COMMENT '报修类型',
+    `level`         int                                                           NULL DEFAULT NULL COMMENT '紧急程度',
     PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB
   CHARACTER SET = utf8mb4
@@ -133,6 +135,24 @@ CREATE TABLE IF NOT EXISTS `sync_edit_type`
 
 SET FOREIGN_KEY_CHECKS = 1;
 
+
+CREATE TABLE IF NOT EXISTS `device_repair_order_detail`
+(
+    `id`         bigint(0)                                                     NOT NULL,
+    `orderIdFk`  varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+    `code`       varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '项目编号',
+    `content`    varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '项目内容',
+    `type`       int(0)                                                        NULL DEFAULT NULL COMMENT '项目类型：1：巡检；2：养护',
+    `remark`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci 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 '更新时间',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci
+  ROW_FORMAT = Dynamic;
+
+
 # INSERT ignore INTO `auth_menu`(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2000, '我的申购单 ', 1674, 2, 'purchase/purApply/pureApplyMySearch', 'purchase/purApply/pureApplyMySearch', NULL, 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2023-07-20 17:08:38', NULL, NULL, NULL);
 # INSERT ignore INTO `udi_wms_wmd`.`auth_menu`(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2001, '我的领用单', 1685, 1, 'inout/receive/receiveMySearch', 'inout/receive/receiveMySearch', NULL, 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2023-08-14 10:35:30', NULL, NULL, NULL);
 #