盘点详情-任务明细bug调整

pda版本更新bug调整

src/main/java/com/jsh/erp/controller/pda/PdaController.java

@@ -308,7 +308,7 @@ public class PdaController extends BaseController {
     }
 
     @ApiOperation("查询版本信息")
-    @GetMapping("selectVersion")
+    @GetMapping("/selectVersion")
     public AjaxResult selectVersion() {
         ApkVersion apkVersion = apkVersionService.getOne(new LambdaQueryWrapperX<ApkVersion>().orderByDesc(ApkVersion::getId).last("limit 1"));
         return AjaxResult.success(apkVersion);

src/main/java/com/jsh/erp/datasource/pda/vo/PDATaskStocktakingItemVO.java

@@ -1,5 +1,6 @@
 package com.jsh.erp.datasource.pda.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -35,6 +36,7 @@ public class PDATaskStocktakingItemVO {
     private String createName;
 
     @ApiModelProperty("盘点时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date operTime;
 
     @ApiModelProperty("库存数")

src/main/java/com/jsh/erp/datasource/pda/vo/PDATaskStocktakingVO.java

@@ -22,7 +22,7 @@ public class PDATaskStocktakingVO {
     private String depotName;
 
     @ApiModelProperty("创建人名称")
-    private String createByName;
+    private String createName;
 
     @ApiModelProperty("负责人名称")
     private String creatorName;

src/main/java/com/jsh/erp/datasource/vo/TaskStocktakingItemVO.java

@@ -30,6 +30,12 @@ public class TaskStocktakingItemVO {
     @ApiModelProperty("商品单位")
     private String commodityUnit;
 
+    @ApiModelProperty("库位")
+    private String position;
+
+    @ApiModelProperty("批次号")
+    private String batchNumber;
+
     @ApiModelProperty("生产日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date productionDate;

src/main/java/com/jsh/erp/filter/LogCostFilter.java

@@ -56,7 +56,8 @@ public class LogCostFilter implements Filter {
             return;
         }
         if (requestUrl != null && (requestUrl.contains("/doc.html") ||
-            requestUrl.contains("/user/pdaLogin") || requestUrl.contains("/pad/downloadApk") || requestUrl.contains("/pad/selectVersion") ||
+            requestUrl.contains("/user/pdaLogin") || requestUrl.contains("/pda/downloadApk")
+                || requestUrl.contains("/pda/selectVersion") ||
             requestUrl.contains("/user/login") || requestUrl.contains("/user/register") || requestUrl.contains("/user/randomImage"))) {
             chain.doFilter(request, response);
             return;

src/main/resources/mapper_xml/TaskStocktakingItemMapper.xml

@@ -61,6 +61,8 @@
             tsi.id AS id,
             mc.`name` AS category_name,
             m.`name` AS material_name,
+            me.position AS position,
+            me.batch_number AS batch_number,
             m.system_sku AS system_sku,
             me.commodity_unit AS commodity_unit,
             me.production_date AS production_date,

src/main/resources/mapper_xml/TaskStocktakingMapper.xml

@@ -26,7 +26,7 @@
         <where>
             ts.delete_flag = 0
             <if test="number != null and number != ''">
-                AND (ts.task_name LIKE CONCAT('%',#{taskName},'%') OR ts.number LIKE CONCAT('%',#{number},'%'))
+                AND (ts.task_name LIKE CONCAT('%',#{number},'%') OR ts.number LIKE CONCAT('%',#{number},'%'))
             </if>
             <if test="taskStatus != null and taskStatus != 0">
                 AND ts.task_status = #{taskStatus}