pda盘点商品条码搜索，pc商品信息导出、订单税额、序列号bug修改

docs/new_sql.sql

@@ -239,7 +239,8 @@ ALTER TABLE jsh_supplier
 
 -- 单据主表 新增复核
 ALTER TABLE jsh_depot_head
-  ADD COLUMN auditor BIGINT DEFAULT NULL COMMENT '复核人员';
+  ADD COLUMN auditor BIGINT DEFAULT NULL COMMENT '复核人员',
+  ADD COLUMN tax_rate DECIMAL(24,6) DEFAULT NULL COMMENT '税率';
 
 
 

src/main/java/com/jsh/erp/datasource/entities/DepotHead.java

@@ -160,6 +160,9 @@ public class DepotHead {
     @ApiModelProperty("复核人员")
     private Long auditor;
 
+    @ApiModelProperty("税率")
+    private BigDecimal taxRate;
+
 
     public Long getId() {
         return id;

src/main/java/com/jsh/erp/service/impl/DepotItemServiceImpl.java

@@ -835,8 +835,8 @@ public class DepotItemServiceImpl extends ServiceImpl<DepotItemMapper, DepotItem
                                 //跳过
                             } else {
                                 //售出序列号，获得当前操作人
-                                User userInfo = userService.getCurrentUser();
-                                serialNumberService.checkAndUpdateSerialNumber(depotItem, depotHead.getNumber(), userInfo, StringUtil.toNull(depotItem.getSnList()));
+                                //User userInfo = userService.getCurrentUser();
+                                //serialNumberService.checkAndUpdateSerialNumber(depotItem, depotHead.getNumber(), userInfo, StringUtil.toNull(depotItem.getSnList()));
                             }
                         }
                     }

src/main/java/com/jsh/erp/service/impl/MaterialServiceImpl.java

@@ -599,8 +599,8 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
                 objs[12] = m.getEnableSerialNumber();
                 objs[13] = m.getSystemSku();
                 objs[14] = m.getBarCode();
-                objs[15] = m.getDefaultPurchaseDecimal().toString();
-                objs[16] = m.getDefaultWholesaleDecimal().toString();
+                objs[15] = m.getDefaultPurchaseDecimal() == null ? "" : m.getDefaultPurchaseDecimal().toString();
+                objs[16] = m.getDefaultWholesaleDecimal() == null ? "" : m.getDefaultWholesaleDecimal().toString();
                 objs[17] = m.getOtherField1();
                 objs[18] = m.getOtherField2();
                 objs[19] = m.getOtherField3();

src/main/resources/mapper_xml/DepotHeadMapper.xml

@@ -285,6 +285,9 @@
       <if test="operId != null">
         oper_id,
       </if>
+      <if test="taxRate != null">
+        tax_rate,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -410,6 +413,9 @@
       <if test="operId != null">
         #{operId,jdbcType=INTEGER},
       </if>
+      <if test="taxRate != null">
+        #{taxRate},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultType="java.lang.Long">
@@ -709,7 +715,10 @@
         depot_id = #{depotId,jdbcType=BIGINT},
       </if>
       <if test="operId != null">
-        oper_id = #{operId,jdbcType=BIGINT}
+        oper_id = #{operId,jdbcType=BIGINT},
+      </if>
+      <if test="taxRate != null">
+        tax_rate = #{taxRate}
       </if>
     </set>
     where id = #{id,jdbcType=BIGINT}

src/main/resources/mapper_xml/TaskStocktakingItemMapper.xml

@@ -29,7 +29,7 @@
             AND tsi.task_stocktaking_id = #{taskId}
             <if test="number != null and number != ''">
                 AND (m.name LIKE CONCAT('%',#{number},'%')
-                OR me.batch_number LIKE CONCAT('%',#{number},'%')
+                OR me.bar_code LIKE CONCAT('%',#{number},'%')
                 OR me.position LIKE CONCAT('%',#{number},'%')
                 OR m.system_sku LIKE CONCAT('%',#{number},'%'))
             </if>