增加"垛位备注"信息，并增加该查询项

src/main/java/com/th/demo/controller/ware/StoreController.java

@@ -101,6 +101,7 @@ public class StoreController {
                              String customerName,
                              String plateNo,
                              String ordNo,
+                              String remark1,
                               HttpServletRequest request) {
 
         try {
@@ -116,6 +117,7 @@ public class StoreController {
                     customerName,
                     plateNo,
                     ordNo,
+                    remark1,
                     userId,
                     belongId);
         } catch (Exception ex) {

src/main/java/com/th/demo/mapping/ware/StoreMapper.java

@@ -32,7 +32,8 @@ public interface StoreMapper {
     Store selectByOutId(String id,String noUserParam,String userId, String belongId);
 
     List<Store> selectStore(String wareName, String stackName, String model, String materialName, String standard,
-                            String customerName,String plateNo,String orderNo,List<String> plateNos,List<String> ordNos, String userId,String belongId);
+                            String customerName,String plateNo,String orderNo,List<String> plateNos,List<String> ordNos,
+                            String userId,String belongId, String remark1);
 
     int updateForUpDownByLayer(String wareName, String stackName, String userId, String belongId, int min, int max, int i);
 

src/main/java/com/th/demo/model/ware/Store.java

@@ -76,6 +76,16 @@ public class Store  implements Comparable<Store>{
     private Double invoicePrice;
     private String contractNo;
 
+    private String remark1;
+
+    public String getRemark1() {
+        return remark1;
+    }
+
+    public void setRemark1(String remark1) {
+        this.remark1 = remark1;
+    }
+
     public String getContractNo() {
         return contractNo;
     }

src/main/java/com/th/demo/service/impl/ware/InServiceImpl.java

@@ -387,6 +387,12 @@ public class InServiceImpl implements InService {
             store.setModel(listJO.get(i).get("规格").toString());
             store.setCount(Double.parseDouble(listJO.get(i).get("数量").toString()));
             store.setWeight(Double.parseDouble(listJO.get(i).get("重量").toString()));
+            if(listJO.get(i).get("垛位备注") != null){
+                store.setRemark1(listJO.get(i).get("垛位备注").toString());
+            }else {
+                store.setRemark1("");
+            }
+
             /*if (listJO.get(i).get("目的地") == null || listJO.get(i).get("目的地").toString().equals("")) {
                 store.setReceiveAddress(customer.getAddress());
             } else {

src/main/java/com/th/demo/service/impl/ware/StoreServiceImpl.java

@@ -82,6 +82,7 @@ public class StoreServiceImpl implements StoreService {
                              String customerName,
                              String plateNo,
                              String ordNo,
+                             String remark1,
                              String userId,
                              String belongId) {
         PageHelper.startPage(page, rows);
@@ -94,7 +95,8 @@ public class StoreServiceImpl implements StoreService {
             ordNos = Arrays.asList(ordNo.split(","));
         }
 
-        List<Store> list=storeMapper.selectStore(wareName,stackName,model,materialName,standard, customerName, plateNo,ordNo, pltNos,ordNos, userId,belongId);
+        List<Store> list=storeMapper.selectStore(wareName,stackName,model,materialName,standard,
+                customerName, plateNo,ordNo, pltNos,ordNos, userId,belongId,remark1);
         PageInfo<Store> pageInfo = new PageInfo<>(list);
         result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
         return result;

src/main/java/com/th/demo/service/ware/StoreService.java

@@ -12,7 +12,7 @@ public interface StoreService {
     String modify(String json, String userId, String belongId);
 
     String queryStore(int page,int rows,String wareName,String stackName,String model,String materialName,String
-            standard,  String customerName,  String plateNo,String ordNo, String userId,String belongId);
+            standard,  String customerName,  String plateNo,String ordNo,String remark1, String userId,String belongId);
 
     String modifyCustomer(String id,String customerNameOld,String customerNameNew);
 

src/main/resource/mapper/ware/StoreMapper.xml

@@ -30,6 +30,7 @@
     <result column="car_no" property="carNo" jdbcType="VARCHAR" />
     <result column="tally_people" property="tallyPeople" jdbcType="VARCHAR" />
     <result column="fk_compony_id" property="fkComponyId" jdbcType="VARCHAR" />
+    <result column="remark1" property="remark1" jdbcType="VARCHAR" />
 
     <result column="invoice_price" property="invoicePrice" jdbcType="DOUBLE" />
     <result column="contract_no" property="contractNo" jdbcType="VARCHAR" />
@@ -57,7 +58,8 @@
   <sql id="Base_Column_List" >
     id, ware_id, stack_id, layer, material_id, model, plate_no, customer_id, count, weight,
     remark, add_id, add_time, modify_id, modify_time, cancel_id, cancel_time, cancel_flag,
-    belong_id, in_id, out_id, receive_address, out_flag, lock_flag,wgt_dcn_mtc_cd,edge_ty,production_place,contract_no
+    belong_id, in_id, out_id, receive_address, out_flag, lock_flag,wgt_dcn_mtc_cd,edge_ty,
+    production_place,contract_no,remark1
   </sql>
 
 
@@ -87,7 +89,7 @@
       belong_id, in_id, out_id,
       receive_address, out_flag, lock_flag
       ,wgt_dcn_mtc_cd,edge_ty,production_place,ord_no
-      ,car_no,tally_people,fk_compony_id,invoice_price,contract_no
+      ,car_no,tally_people,fk_compony_id,invoice_price,contract_no,remark1
     )
     values (#{id,jdbcType=VARCHAR}, #{ware.id,jdbcType=VARCHAR}, #{stack.id,jdbcType=VARCHAR},
       #{layer,jdbcType=INTEGER}, #{material.id,jdbcType=VARCHAR}, #{model,jdbcType=VARCHAR},
@@ -99,6 +101,7 @@
       #{receiveAddress,jdbcType=VARCHAR}, #{outFlag,jdbcType=VARCHAR}, #{lockFlag,jdbcType=VARCHAR}
       ,#{wgtDcnMtcCd,jdbcType=VARCHAR},#{edgeTy,jdbcType=VARCHAR},#{productionPlace,jdbcType=VARCHAR},#{ordNo,jdbcType=VARCHAR}
      ,#{carNo,jdbcType=VARCHAR},#{tallyPeople,jdbcType=VARCHAR},#{fkComponyId,jdbcType=VARCHAR},#{invoicePrice,jdbcType=DOUBLE},#{contractNo,jdbcType=VARCHAR}
+    ,#{remark1,jdbcType=VARCHAR}
       )
   </insert>
 
@@ -326,7 +329,8 @@
       receive_address = #{receiveAddress,jdbcType=VARCHAR},
       out_flag = #{outFlag,jdbcType=VARCHAR},
       lock_flag = #{lockFlag,jdbcType=VARCHAR},
-      contract_no = #{contractNo,jdbcType=VARCHAR}
+      contract_no = #{contractNo,jdbcType=VARCHAR},
+      remark1 = #{remark1,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 
@@ -438,6 +442,7 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
     and  c.name like concat('%',#{param4,jdbcType=VARCHAR},'%')
     and  c.standard like concat('%',#{param5,jdbcType=VARCHAR},'%')
     and  d.name like concat('%',#{param6,jdbcType=VARCHAR},'%')
+    and  t.remark1 like concat('%',#{param13,jdbcType=VARCHAR},'%')
     and  (t.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
         <if test="param9 != null and param9.size() !=0" >
           OR t.plate_no IN <foreach  item="item" collection="param9" index="index"  open="(" separator="," close=")">