111

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

@@ -33,6 +33,7 @@ public class OutRecordController {
                            String tallyPeople,
                            String ordNo,
                            String fkComponyName,
+                           String remark1,
                            HttpServletRequest request) {
 
         try {
@@ -42,7 +43,7 @@ public class OutRecordController {
             Date toDate = DateTools.StrToDate(pToDate, "yyyy-MM-dd HH:mm:ss");
 
             result = outRecordService.query(page, rows, wareName, stackName, model, materialName, standard, customerName,
-                    plateNo,fromDate,toDate, userId, belongId,carNo,tallyPeople,ordNo,fkComponyName);
+                    plateNo,fromDate,toDate, userId, belongId,carNo,tallyPeople,ordNo,fkComponyName,remark1);
         } catch (Exception ex) {
             ex.printStackTrace();
             result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
@@ -64,6 +65,7 @@ public class OutRecordController {
                         String tallyPeople,
                         String ordNo,
                         String fkComponyName,
+                        String remark1,
                         HttpServletRequest request) {
 
         try {
@@ -72,7 +74,7 @@ public class OutRecordController {
             Date fromDate = DateTools.StrToDate(pFromDate, "yyyy-MM-dd HH:mm:ss");
             Date toDate = DateTools.StrToDate(pToDate, "yyyy-MM-dd HH:mm:ss");
             result = outRecordService.queryTotal(page, rows, wareName, stackName, model, materialName, standard, customerName,
-                    plateNo,fromDate,toDate, userId, belongId,carNo,tallyPeople,ordNo,fkComponyName);
+                    plateNo,fromDate,toDate, userId, belongId,carNo,tallyPeople,ordNo,fkComponyName,remark1);
         } catch (Exception ex) {
             ex.printStackTrace();
             result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());

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

@@ -22,9 +22,11 @@ public interface OutRecordMapper {
     List<OutRecord>  select(String wareName, String stackName, String layer, String materialName, String standard, String customerName,
                             String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople, String ordNo, String fkComponyName);
     List<OutRecord>  selectExpt(String wareName, String stackName, String layer, String materialName, String standard, String customerName,
-                            String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople, String ordNo, String fkComponyName);
+                            String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople,
+                             String ordNo, String fkComponyName,List<String> plateNos,List<String> ordNos,String remark1);
     List<TotalRecord>  selectTotal(String wareName, String stackName, String layer, String materialName, String standard, String customerName,
-                                   String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople, String ordNo, String fkComponyName);
+                                   String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo,
+                                   String tallyPeople, String ordNo, String fkComponyName,List<String> plateNos,List<String> ordNos,String remark1);
 
     int updateVerifyAccount(String id, String uuid);
 

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

@@ -62,6 +62,7 @@ public class InRecord {
 
     private String fkComponyName;
     private double invoicePrice;
+    private String remark1;
 
     public double getInvoicePrice() {
         return invoicePrice;
@@ -331,4 +332,12 @@ public class InRecord {
     public void setReceiveAddress(String receiveAddress) {
         this.receiveAddress = receiveAddress == null ? null : receiveAddress.trim();
     }
+
+    public String getRemark1() {
+        return remark1;
+    }
+
+    public void setRemark1(String remark1) {
+        this.remark1 = remark1;
+    }
 }

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

@@ -86,6 +86,7 @@ public class OutRecord {
     private Double storeFee;
     private Integer inWareDays;
     private Double unitPrice;
+    private String remark1; //垛位备注
 
     public Double getUnitPrice() {
         return unitPrice;
@@ -437,4 +438,12 @@ public class OutRecord {
     public void setProductionPlace(String productionPlace) {
         this.productionPlace = productionPlace;
     }
+
+    public String getRemark1() {
+        return remark1;
+    }
+
+    public void setRemark1(String remark1) {
+        this.remark1 = remark1;
+    }
 }

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

@@ -488,6 +488,7 @@ public class InServiceImpl implements InService {
         inRecord.setOrdNo(store.getOrdNo());
         inRecord.setCarNo(store.getCarNo());
         inRecord.setTallyPeople(store.getTallyPeople());
+        inRecord.setRemark1(store.getRemark1());
 
         return inRecord;
     }

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

@@ -20,6 +20,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -38,15 +40,25 @@ public class OutRecordServiceImpl implements OutRecordService {
     int num = 0;
 
     public String query(int page, int rows, String wareName, String stackName, String model, String materialName, String standard, String customerName,
-                        String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople, String ordNo, String fkComponyName) {
+                        String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo,
+                        String tallyPeople, String ordNo, String fkComponyName,String remark1) {
+        List<String> pltNos =new ArrayList<>() ;
+        List<String> ordNos =new ArrayList<>() ;
+        if (plateNo.indexOf(",") != -1){
+            pltNos = Arrays.asList(plateNo.split(","));
+        }
+        if (ordNo.indexOf(",") != -1){
+            ordNos = Arrays.asList(ordNo.split(","));
+        }
+
         if(page == -1 && rows == -1){
             List<OutRecord> list=outRecordMapper.selectExpt(wareName,stackName,model,materialName,standard,  customerName,
-                    plateNo, fromDate,  toDate,   userId, belongId,carNo, tallyPeople,ordNo,fkComponyName);
+                    plateNo, fromDate,  toDate,   userId, belongId,carNo, tallyPeople,ordNo,fkComponyName, pltNos,ordNos,remark1);
             result = JSONTools.toStringyyyyMMddHHmmss(list);
         }else{
             PageHelper.startPage(page, rows);
             List<OutRecord> list=outRecordMapper.selectExpt(wareName,stackName,model,materialName,standard,  customerName,
-                    plateNo, fromDate,  toDate,   userId, belongId,carNo,tallyPeople,ordNo,fkComponyName);
+                    plateNo, fromDate,  toDate,   userId, belongId,carNo,tallyPeople,ordNo,fkComponyName, pltNos,ordNos,remark1);
             PageInfo<OutRecord> pageInfo = new PageInfo<>(list);
 //        result = JSONTools.toString(pageInfo);
             result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
@@ -55,9 +67,19 @@ public class OutRecordServiceImpl implements OutRecordService {
         return result;
     }
     public String queryTotal(int page, int rows, String wareName, String stackName, String model, String materialName, String standard, String customerName,
-                             String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople, String ordNo, String fkComponyName) {
+                             String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo,
+                             String tallyPeople, String ordNo, String fkComponyName,String remark1) {
+        List<String> pltNos =new ArrayList<>() ;
+        List<String> ordNos =new ArrayList<>() ;
+        if (plateNo.indexOf(",") != -1){
+            pltNos = Arrays.asList(plateNo.split(","));
+        }
+        if (ordNo.indexOf(",") != -1){
+            ordNos = Arrays.asList(ordNo.split(","));
+        }
+
         List<TotalRecord> list=outRecordMapper.selectTotal(wareName,stackName,model,materialName,standard,  customerName,
-                plateNo,fromDate,toDate,   userId, belongId,carNo,tallyPeople,ordNo,fkComponyName);
+                plateNo,fromDate,toDate,   userId, belongId,carNo,tallyPeople,ordNo,fkComponyName, pltNos,ordNos,remark1);
         result = JSONTools.toString(list);
         return result;
     }

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

@@ -5,9 +5,11 @@ import java.util.Date;
 public interface OutRecordService {
 
     String query(int page, int rows, String wareName, String stackName, String model, String materialName, String standard, String customerName,
-                 String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople, String ordNo, String fkComponyName);
+                 String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople,
+                 String ordNo, String fkComponyName,String remark1);
     String queryTotal(int page, int rows, String wareName, String stackName, String model, String materialName, String standard, String customerName,
-                      String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople, String ordNo, String fkComponyName);
+                      String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople,
+                      String ordNo, String fkComponyName,String remark1);
 
     String saveVerifyAcc(String json, String accWgt, String accAmt, String invoiceAmt, String accDate, String accReminder, String userId, String belongId);
 

src/main/resource/localhost/db.properties

@@ -1,15 +1,15 @@
-#jdbc.driverClass=com.mysql.jdbc.Driver
-#jdbc.jdbcUrl=jdbc:mysql://172.18.200.32:3306/ware_mj?useUnicode=true&characterEncoding=utf8
-#jdbc.user=root
-#jdbc.password=root
-
-#???????????????????????????????
 jdbc.driverClass=com.mysql.jdbc.Driver
-jdbc.jdbcUrl=jdbc:mysql://localhost:3306/ware_mj?characterEncoding=utf8
+jdbc.jdbcUrl=jdbc:mysql://172.18.200.32:3306/ware_mj?useUnicode=true&characterEncoding=utf8
 jdbc.user=root
 jdbc.password=root
 
+#???????????????????????????????
+#jdbc.driverClass=com.mysql.jdbc.Driver
+#jdbc.jdbcUrl=jdbc:mysql://localhost:3306/ware_mj?characterEncoding=utf8
+#jdbc.user=root
+#jdbc.password=root
+
 #jdbc.driverClass=com.mysql.jdbc.Driver
-#jdbc.jdbcUrl=jdbc:mysql://60.205.9.174:3309/thware?useUnicode=true&characterEncoding=utf8
+#jdbc.jdbcUrl=jdbc:mysql://60.205.9.174:3309/ware_mj?useUnicode=true&characterEncoding=utf8
 #jdbc.user=root
 #jdbc.password=122403

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

@@ -33,6 +33,7 @@
     <result column="ord_no" property="ordNo" jdbcType="VARCHAR" />
     <result column="tally_people" property="tallyPeople" jdbcType="VARCHAR" />
     <result column="fk_compony_name" property="fkComponyName" jdbcType="VARCHAR" />
+    <result column="remark1" property="remark1" jdbcType="VARCHAR" />
     <association  column="add_id" property="addUser" select="com.th.demo.mapping.system.SysUserMapper.selectByPrimaryKey" />
 
   </resultMap>
@@ -42,7 +43,7 @@
   </resultMap>
   <sql id="Base_Column_List" >
     id, ware_name, stack_name, layer, material_name, material_no, standard, model, customer_name, 
-    customer_no, count, weight, remark, add_id, add_time, modify_id, modify_time, cancel_id, 
+    customer_no, count, weight, remark, add_id, add_time, modify_id, modify_time, cancel_id, remark1,
     cancel_time, cancel_flag, belong_id, plate_no,record_type,receive_address ,wgt_dcn_mtc_cd,edge_ty,production_place
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
@@ -69,7 +70,7 @@
       modify_id, modify_time, cancel_id, 
       cancel_time, cancel_flag, belong_id, 
       plate_no,record_type,receive_address
-    ,wgt_dcn_mtc_cd,edge_ty,production_place,car_no,ord_no,tally_people,fk_compony_name)
+    ,wgt_dcn_mtc_cd,edge_ty,production_place,car_no,ord_no,tally_people,fk_compony_name,reamrk1)
     values (#{id,jdbcType=VARCHAR}, #{wareName,jdbcType=VARCHAR}, #{stackName,jdbcType=VARCHAR}, 
       #{layer,jdbcType=INTEGER}, #{materialName,jdbcType=VARCHAR}, #{materialNo,jdbcType=VARCHAR}, 
       #{standard,jdbcType=VARCHAR}, #{model,jdbcType=VARCHAR}, #{customerName,jdbcType=VARCHAR}, 
@@ -79,7 +80,7 @@
       #{cancelTime,jdbcType=TIMESTAMP}, #{cancelFlag,jdbcType=VARCHAR}, #{belongId,jdbcType=VARCHAR},
     #{plateNo,jdbcType=VARCHAR},#{recordType,jdbcType=VARCHAR}, #{receiveAddress,jdbcType=VARCHAR}
     ,#{wgtDcnMtcCd,jdbcType=VARCHAR},#{edgeTy,jdbcType=VARCHAR},#{productionPlace,jdbcType=VARCHAR},#{carNo,jdbcType=VARCHAR}
-    ,#{ordNo,jdbcType=VARCHAR},#{tallyPeople,jdbcType=VARCHAR},#{fkComponyName,jdbcType=VARCHAR})
+    ,#{ordNo,jdbcType=VARCHAR},#{tallyPeople,jdbcType=VARCHAR},#{fkComponyName,jdbcType=VARCHAR},#{remark1,jdbcType=VARCHAR}
   </insert>
   <insert id="insertSelective" parameterType="com.th.demo.model.ware.InRecord" >
     insert into t_ware_in_record
@@ -312,8 +313,9 @@
       cancel_flag = #{cancelFlag,jdbcType=VARCHAR},
       belong_id = #{belongId,jdbcType=VARCHAR},
       plate_no = #{plateNo,jdbcType=VARCHAR},
-         record_type = #{recordType,jdbcType=VARCHAR},
-    receive_address = #{receiveAddress,jdbcType=VARCHAR}
+      record_type = #{recordType,jdbcType=VARCHAR},
+      receive_address = #{receiveAddress,jdbcType=VARCHAR},
+      remark1 = #{remark1,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 

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

@@ -43,6 +43,7 @@
 
     <result column="in_ware_days" property="inWareDays" jdbcType="INTEGER" />
     <result column="store_fee" property="storeFee" jdbcType="DOUBLE" />
+    <result column="remark1" property="remark1" jdbcType="VARCHAR" />
 
     <association  column="add_id" property="addUser" select="com.th.demo.mapping.system.SysUserMapper.selectByPrimaryKey" />
     <association  column="distribution_id" property="distribution" select="com.th.demo.mapping.ware.DistributionMapper.selectByPrimaryKey" />
@@ -97,7 +98,7 @@
   </resultMap>
   <sql id="Base_Column_List" >
     id, ware_name, stack_name, layer, material_name, material_no, standard, model, customer_name, 
-    customer_no, count, weight, remark, add_id, add_time, modify_id, modify_time, cancel_id, 
+    customer_no, count, weight, remark, add_id, add_time, modify_id, modify_time, cancel_id, remark1,
     cancel_time, cancel_flag, belong_id, plate_no,in_id, record_type,back_flag,receive_address,distribution_id,wgt_dcn_mtc_cd,edge_ty,production_place,verify_account_id,unit_price
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
@@ -122,7 +123,8 @@
       modify_id, modify_time, cancel_id, 
       cancel_time, cancel_flag, belong_id, 
       plate_no,in_id, record_type,back_flag,receive_address,distribution_id
-    ,wgt_dcn_mtc_cd,edge_ty,production_place,tally_people,invoice_price,unit_price)
+    ,wgt_dcn_mtc_cd,edge_ty,production_place,tally_people,invoice_price,unit_price
+    ,remark1)
     values (#{id,jdbcType=VARCHAR}, #{wareName,jdbcType=VARCHAR}, #{stackName,jdbcType=VARCHAR}, 
       #{layer,jdbcType=INTEGER}, #{materialName,jdbcType=VARCHAR}, #{materialNo,jdbcType=VARCHAR}, 
       #{standard,jdbcType=VARCHAR}, #{model,jdbcType=VARCHAR}, #{customerName,jdbcType=VARCHAR}, 
@@ -132,7 +134,8 @@
       #{cancelTime,jdbcType=TIMESTAMP}, #{cancelFlag,jdbcType=VARCHAR}, #{belongId,jdbcType=VARCHAR},
     #{plateNo,jdbcType=VARCHAR},  #{inId,jdbcType=VARCHAR}, #{recordType,jdbcType=VARCHAR},
     #{backFlag,jdbcType=VARCHAR}, #{receiveAddress,jdbcType=VARCHAR}, #{distributionId,jdbcType=VARCHAR}
-    ,#{wgtDcnMtcCd,jdbcType=VARCHAR},#{edgeTy,jdbcType=VARCHAR},#{productionPlace,jdbcType=VARCHAR},#{tallyPeople,jdbcType=VARCHAR},#{invoicePrice,jdbcType=DOUBLE},#{unitPrice,jdbcType=DOUBLE})
+    ,#{wgtDcnMtcCd,jdbcType=VARCHAR},#{edgeTy,jdbcType=VARCHAR},#{productionPlace,jdbcType=VARCHAR},#{tallyPeople,jdbcType=VARCHAR},#{invoicePrice,jdbcType=DOUBLE},#{unitPrice,jdbcType=DOUBLE}
+    ,#{remark1,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.th.demo.model.ware.OutRecord" >
     insert into t_ware_out_record
@@ -370,7 +373,8 @@
           back_flag =  #{backFlag,jdbcType=VARCHAR},
     receive_address = #{receiveAddress,jdbcType=VARCHAR},
       distribution_id =  #{distributionId,jdbcType=VARCHAR},
-        unit_price =  #{unitPrice,jdbcType=DOUBLE}
+        unit_price =  #{unitPrice,jdbcType=DOUBLE},
+        remark1 =  #{remark1,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 
@@ -434,7 +438,12 @@
     <if test="param6 != null and param6 != ''" >
       and t.customer_name = #{param6,jdbcType=VARCHAR}
     </if>
-    and t.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
+    and (t.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
+    <if test="param16 != null and param16.size() !=0" >
+      OR t.plate_no IN <foreach  item="item" collection="param16" index="index"  open="(" separator="," close=")">
+      #{item,jdbcType=VARCHAR}  </foreach>
+    </if>
+    )
     and t.add_time between #{param8,jdbcType=TIMESTAMP} and #{param9,jdbcType=TIMESTAMP}
     and t.distribution_id = p.id
     and t.plate_no = c.plate_no
@@ -446,8 +455,14 @@
             and  a.user_id = #{param10,jdbcType=VARCHAR}  )
             )  or t.customer_name like CONCAT((select attr3 from sys_user temp where temp.id=#{param10,jdbcType=VARCHAR}),'%') )
     and ifnull(p.tally_people,'*') like concat('%',#{param13,jdbcType=VARCHAR},'%')
-    and ifnull(c.ord_no,'*') like concat('%',#{param14,jdbcType=VARCHAR},'%')
+    and (ifnull(c.ord_no,'*') like concat('%',#{param14,jdbcType=VARCHAR},'%')
+    <if test="param17 != null and param17.size() !=0" >
+      OR ifnull(c.ord_no,'*') IN <foreach  item="item" collection="param17" index="index"  open="(" separator="," close=")">
+      #{item,jdbcType=VARCHAR}  </foreach>
+    </if>
+    )
     and ifnull(e.name,'*') like concat('%',#{param15,jdbcType=VARCHAR},'%')
+    and ifnull(t.remark1,'*') like concat('%',#{param18,jdbcType=VARCHAR},'%')
     and ifnull(t.back_flag,0) &lt;> '1'
     order by t.add_time desc
   </select>
@@ -468,7 +483,12 @@
     <if test="param6 != null and param6 != ''" >
       and t.customer_name  = #{param6,jdbcType=VARCHAR}
     </if>
-    and t.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
+    and (t.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
+        <if test="param16 != null and param16.size() !=0" >
+         OR t.plate_no IN <foreach  item="item" collection="param16" index="index"  open="(" separator="," close=")">
+         #{item,jdbcType=VARCHAR}  </foreach>
+        </if>
+        )
     and t.add_time between #{param8,jdbcType=TIMESTAMP} and #{param9,jdbcType=TIMESTAMP}
     and t.distribution_id = p.id
     and t.plate_no = c.plate_no
@@ -480,8 +500,14 @@
     and  a.user_id = #{param10,jdbcType=VARCHAR}  )
     )  or t.customer_name like CONCAT((select attr3 from sys_user temp where temp.id=#{param10,jdbcType=VARCHAR}),'%') )
     and ifnull(p.tally_people,'*') like concat('%',#{param13,jdbcType=VARCHAR},'%')
-    and ifnull(c.ord_no,'*') like concat('%',#{param14,jdbcType=VARCHAR},'%')
+    and (ifnull(c.ord_no,'*') like concat('%',#{param14,jdbcType=VARCHAR},'%')
+        <if test="param17 != null and param17.size() !=0" >
+        OR ifnull(c.ord_no,'*') IN <foreach  item="item" collection="param17" index="index"  open="(" separator="," close=")">
+        #{item,jdbcType=VARCHAR}  </foreach>
+        </if>
+        )
     and ifnull(e.name,'*') like concat('%',#{param15,jdbcType=VARCHAR},'%')
+    and ifnull(t.remark1,'*') like concat('%',#{param18,jdbcType=VARCHAR},'%')
     and ifnull(t.back_flag,0) &lt;> '1'
     order by t.add_time desc
   </select>