bug调整

src/main/java/com/jsh/erp/datasource/dto/TaskStocktakingItemQueryDTO.java

@@ -21,7 +21,7 @@ public class TaskStocktakingItemQueryDTO {
     private String batchNumber;
 
     @ApiModelProperty("仓库货架")
-    private Long position;
+    private String position;
 
     @ApiModelProperty("是否存在差异 1：是，2：否，其他是全部")
     private String isDifference;

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

@@ -65,5 +65,8 @@ public class PDADepotItemVO{
     @ApiModelProperty("图片名称")
     private String imgName;
 
+    @ApiModelProperty("出入库时间")
+    private Date warehousingTime;
+
 
 }

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

@@ -80,4 +80,22 @@ public class TaskStocktakingItemVO {
     @ApiModelProperty("删除标记，0.未删除，1.已删除")
     private boolean deleteFlag;
 
+    @ApiModelProperty("商品规格")
+    private String standard;
+
+    @ApiModelProperty("商品型号")
+    private String model;
+
+    @ApiModelProperty("商品颜色")
+    private String color;
+
+    @ApiModelProperty("商品品牌")
+    private String brand;
+
+    @ApiModelProperty("商品多属性")
+    private String sku;
+
+    @ApiModelProperty("商品保质期天数")
+    private String expiryNum;
+
 }

src/main/resources/mapper_xml/DepotHeadMapper.xml

@@ -699,11 +699,8 @@
       <if test="receiverAddress != null">
         receiver_address = #{receiverAddress,jdbcType=VARCHAR},
       </if>
-      <if test="depotId != null">
-        depot_id = #{receiverAddress,jdbcType=VARCHAR},
-      </if>
       <if test="operId != null">
-        oper_id = #{receiverAddress,jdbcType=VARCHAR}
+        oper_id = #{operId,jdbcType=VARCHAR}
       </if>
     </set>
     where id = #{id,jdbcType=BIGINT}

src/main/resources/mapper_xml/TaskStocktakingItemMapper.xml

@@ -28,9 +28,10 @@
             tsi.delete_flag = 0
             AND tsi.task_stocktaking_id = #{taskId}
             <if test="number != null and number != ''">
-                m.name LIKE CONCAT('%',#{number},'%')
+                AND (m.name LIKE CONCAT('%',#{number},'%')
                 OR me.batch_number LIKE CONCAT('%',#{number},'%')
-                OR m.system_sku LIKE CONCAT('%',#{number},'%')
+                OR me.position LIKE CONCAT('%',#{number},'%')
+                OR m.system_sku LIKE CONCAT('%',#{number},'%'))
             </if>
             <if test="userIdList != null and userIdList.size > 0">
                 AND tsi.creator IN
@@ -50,6 +51,9 @@
                      me.position LIKE CONCAT('%',#{item},'%')
                 </foreach>
             </if>
+            <if test="position != null and position != ''">
+                AND me.position LIKE CONCAT('%',#{position},'%')
+            </if>
             <if test="statusList != null and statusList.size > 0">
                 AND tsi.status IN
                 <foreach collection="statusList" item="item" open="(" separator="," close=")">
@@ -67,14 +71,20 @@
             tsi.id AS id,
             mc.`name` AS category_name,
             m.`name` AS material_name,
+            m.standard AS standard,
+            m.model AS model,
+            m.color AS color,
+            m.brand AS brand,
             me.position AS position,
             me.batch_number AS batch_number,
             m.system_sku AS system_sku,
+            me.sku AS sku,
             me.commodity_unit AS commodity_unit,
             me.production_date AS production_date,
             s.supplier AS supplier_name,
             me.bar_code AS bar_code,
             me.inventory AS inventory,
+            me.expiry_num AS expiry_num,
             d.`name` AS depot_name,
             tsi.new_position AS new_position,
             tsi.new_inventory AS new_inventory,
@@ -100,7 +110,7 @@
                 AND me.batch_number = #{batchNumber}
             </if>
             <if test="position != null and position != ''">
-                AND me.position = #{position}
+                AND me.position LIKE  CONCAT('%',#{position},'%')
             </if>
             <if test="isDifference != null and isDifference == '1'">
                 AND tsi.new_inventory = me.inventory