111

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

@@ -35,6 +35,7 @@ public class InRecordController {
                         String carNo,
                         String tallyPeople,
                         String fkComponyName,
+                        String remark1,
                         HttpServletRequest request) {
 
         try {
@@ -43,7 +44,7 @@ public class InRecordController {
             Date fromDate2 = DateTools.StrToDate(fromDate, "yyyy-MM-dd HH:mm:ss");
             Date toDate2 = DateTools.StrToDate(toDate, "yyyy-MM-dd HH:mm:ss");
             result = inRecordService.query(page, rows, wareName, stackName, model, materialName, standard, customerName,
-                    plateNo,fromDate2,toDate2,userId, belongId,ordNo,carNo,tallyPeople,fkComponyName);
+                    plateNo,fromDate2,toDate2,userId, belongId,ordNo,carNo,tallyPeople,fkComponyName,remark1);
         } catch (Exception ex) {
             ex.printStackTrace();
             result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
@@ -82,6 +83,7 @@ public class InRecordController {
                         String carNo,
                         String tallyPeople,
                         String fkComponyName,
+                        String remark1,
                         HttpServletRequest request) {
 
         try {
@@ -90,7 +92,24 @@ public class InRecordController {
             Date fromDate2 = DateTools.StrToDate(fromDate, "yyyy-MM-dd HH:mm:ss");
             Date toDate2 = DateTools.StrToDate(toDate, "yyyy-MM-dd HH:mm:ss");
             result = inRecordService.queryTotal(page, rows, wareName, stackName, model, materialName, standard, customerName,
-                    plateNo,fromDate2,toDate2 ,userId, belongId,ordNo,carNo,tallyPeople,fkComponyName);
+                    plateNo,fromDate2,toDate2 ,userId, belongId,ordNo,carNo,tallyPeople,fkComponyName,remark1);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
+        } finally {
+            return result;
+        }
+    }
+
+    @RequestMapping(value = "/deleterecord.do")
+    public String deleterecord(String json,
+                             HttpServletRequest request) {
+
+        try {
+            String userId = (String) request.getAttribute("userId");
+            String belongId = (String) request.getAttribute("belongId");
+
+            result = inRecordService.deleterecord(json ,userId, belongId);
         } catch (Exception ex) {
             ex.printStackTrace();
             result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());

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

@@ -70,4 +70,21 @@ public class OutController {
         }
     }
 
+    @RequestMapping(value = "/changeCarNo.do", method = RequestMethod.POST)
+    public String changeCarNo(String distId,
+                       String carNo,
+                       HttpServletRequest request) {
+
+        try {
+            String userId = (String) request.getAttribute("userId");
+            String belongId = (String) request.getAttribute("belongId");
+            result = outService.changeCarNo(distId,carNo,userId,belongId);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
+        } finally {
+            return result;
+        }
+    }
+
 }

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

@@ -11,7 +11,7 @@ public interface DistributionMapper {
 
     int insertSelective(Distribution record);
 
-    Distribution selectByPrimaryKey(Integer id);
+    Distribution selectByPrimaryKey(String id);
 
     int updateByPrimaryKeySelective(Distribution record);
 

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

@@ -24,12 +24,15 @@ public interface InRecordMapper {
     //根据条件查询全部数据
     List<InRecord> select(String wareName, String stackName, String layer, String materialName, String standard, String customerName,
                           String plateNo, Date fromDate,
-                          Date toDate, String userId, String belongId, String ordNo, String carNo, String tallyPeople, String fkComponyName);
+                          Date toDate, String userId, String belongId, String ordNo, String carNo, String tallyPeople, String fkComponyName
+                            ,List<String> plateNos,List<String> ordNos,String remark1);
 
     int updateIn(InRecord inRecord);
 
     List<TrackRecord> selectTrackRecord(String plateNo, String userId, String belongId);
 
     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 ordNo, String carNo, String tallyPeople, String fkComponyName);
+                                  String plateNo, Date fromDate, Date toDate, String userId, String belongId, String ordNo,
+                                  String carNo, String tallyPeople, String fkComponyName,
+                                    List<String> plateNos,List<String> ordNos,String remark1);
 }

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

@@ -55,4 +55,6 @@ public interface StoreMapper {
     void updateByOutId(String id, String noUserParam, String userId, String belongId);
 
     int updateFkById(Store store);
+
+    int selectByInId(String id);
 }

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

@@ -1,17 +1,22 @@
 package com.th.demo.service.impl.ware;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.th.demo.mapping.ware.InRecordMapper;
+import com.th.demo.mapping.ware.StoreMapper;
 import com.th.demo.model.system.Type;
 import com.th.demo.model.ware.InRecord;
+import com.th.demo.model.ware.Store;
 import com.th.demo.model.ware.TotalRecord;
 import com.th.demo.service.ware.InRecordService;
 import com.th.demo.tools.JSONTools;
 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;
 
@@ -20,6 +25,8 @@ public class InRecordServiceImpl implements InRecordService {
 
     @Autowired
     public InRecordMapper inRecordMapper;
+    @Autowired
+    public StoreMapper storeMapper;
 
     String result = Type.FAIL;
     int num = 0;
@@ -27,16 +34,26 @@ public class InRecordServiceImpl implements InRecordService {
     @Override
     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 ordNo, String carNo, String tallyPeople, String fkComponyName) {
+                        Date toDate, String userId, String belongId,
+                        String ordNo, String carNo, String tallyPeople, 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<InRecord> list=inRecordMapper.select(wareName,stackName,model,materialName,standard,    customerName,
-                    plateNo, fromDate,toDate , userId, belongId,ordNo,carNo,tallyPeople,fkComponyName);;
+                    plateNo, fromDate,toDate , userId, belongId,ordNo,carNo,tallyPeople,fkComponyName, pltNos,ordNos,remark1);
             result = JSONTools.toStringyyyyMMddHHmmss(list);
         }else{
             PageHelper.startPage(page, rows);
 
             List<InRecord> list=inRecordMapper.select(wareName,stackName,model,materialName,standard,    customerName,
-                    plateNo, fromDate,toDate , userId, belongId, ordNo, carNo,tallyPeople,fkComponyName);
+                    plateNo, fromDate,toDate , userId, belongId, ordNo, carNo,tallyPeople,fkComponyName, pltNos,ordNos,remark1);
 
             PageInfo<InRecord> pageInfo = new PageInfo<>(list);
             result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
@@ -60,10 +77,35 @@ public class InRecordServiceImpl implements InRecordService {
     }
     @Override
     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 ordNo, String carNo, String tallyPeople, String fkComponyName) {
+                             String plateNo, Date fromDate, Date toDate, String userId, String belongId, String ordNo, String carNo,
+                             String tallyPeople, 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=inRecordMapper.selectTotal(wareName,stackName,model,materialName,standard,    customerName,
-                plateNo,fromDate,toDate,   userId, belongId,ordNo,carNo,tallyPeople,fkComponyName);
+                plateNo,fromDate,toDate,   userId, belongId,ordNo,carNo,tallyPeople,fkComponyName,pltNos, ordNos, remark1);
         result = JSONTools.toStringyyyyMMddHHmmss(list);
         return result;
     }
+
+    @Override
+    public String deleterecord(String json, String userId, String belongId){
+        List<InRecord> inRecord = JSON.parseObject(json, new TypeReference<List<InRecord>>() {
+        });
+        for (int i = 0; i < inRecord.size(); i++) {
+            int num =storeMapper.selectByInId(inRecord.get(i).getId());
+            if(num == 0 ){
+                inRecord.get(i).setCancelFlag("1");
+                num = inRecordMapper.deleteByPrimaryKey(inRecord.get(i).getId());
+            }
+            result = JSONTools.toString(num);
+        }
+
+        return result;
+    }
 }

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

@@ -222,6 +222,15 @@ public class OutServiceImpl implements OutService {
         return result;
     }
 
+    @Override
+    public String changeCarNo(String distId, String carNo, String userId, String belongId){
+        Distribution distribution =  distributionMapper.selectByPrimaryKey(distId);
+        distribution.setTruckNo(carNo);
+        num = distributionMapper.updateByPrimaryKey(distribution);
+        result = Tools.moreThanZeroResultJSON(num);
+        return result;
+    }
+
     private AccountDetail getAccountDetail(Store store, Double sumWeight, Double suttle, String userId, String belongId) throws Exception {
         int changeTime = 0;
         int changeTimeForPrice = 0;
@@ -313,6 +322,7 @@ public class OutServiceImpl implements OutService {
         outRecord.setWgtDcnMtcCd(store.getWgtDcnMtcCd());
         outRecord.setEdgeTy(store.getEdgeTy());
         outRecord.setProductionPlace(store.getProductionPlace());
+        outRecord.setRemark1(store.getRemark1());
         InRecord inRecord = inRecordMapper.selectByPrimaryKey(store.getInId());
         /*double asd = (outRecord.getAddTime().getDate() - inRecord.getAddTime().getTime())/ (24 * 60 * 60 * 1000);
         Price price = priceMapper.selectByMaterialChangeTime(store.getFkComponyId(),store.getBelongId());

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

@@ -5,10 +5,13 @@ import java.util.Date;
 public interface InRecordService {
     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 ordNo, String carNo, String tallyPeople, String fkComponyName);
+                 Date toDate, String userId, String belongId, String ordNo, String carNo, String tallyPeople, String fkComponyName,String remark1);
 
     String updateIn(String json, String userId, String belongId);
 
     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 ordNo, String carNo, String tallyPeople, String fkComponyName);
+                      String plateNo, Date fromDate, Date toDate, String userId, String belongId, String ordNo, String carNo,
+                      String tallyPeople, String fkComponyName, String remark1);
+
+    String deleterecord(String json, String userId, String belongId);
 }

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

@@ -6,4 +6,6 @@ public interface OutService {
     String back(String json, String to, String userId, String belongId);
 
     String outByDistribution(String json, String userId, String belongId) throws Exception;
+
+    String changeCarNo(String distId, String carNo, String userId, String belongId);
 }

src/main/resource/localhost/db.properties

@@ -1,14 +1,14 @@
-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/ware_mj?useUnicode=true&characterEncoding=utf8
 #jdbc.user=root

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

@@ -33,10 +33,9 @@
     add_id, add_time, modify_id, modify_time, cancel_id, cancel_time, cancel_flag, belong_id,delivery_company
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
-    select 
-    <include refid="Base_Column_List" />
+    select *
     from t_ware_distribution
-    where id = #{id,jdbcType=INTEGER}
+    where id = #{id,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from t_ware_distribution

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

@@ -53,7 +53,7 @@
     where id = #{id,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
-    delete from t_ware_in_record
+    update t_ware_in_record set cancel_flag = '1'
     where id = #{id,jdbcType=VARCHAR}
   </delete>
   <insert id="insert" parameterType="com.th.demo.model.ware.InRecord" >
@@ -70,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,reamrk1)
+    ,wgt_dcn_mtc_cd,edge_ty,production_place,car_no,ord_no,tally_people,fk_compony_name,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}, 
@@ -80,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},#{remark1,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
@@ -334,10 +334,19 @@
       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.cancel_flag = '0'
-    and ifnull(t.ord_no,'*') like concat('%',#{param12,jdbcType=VARCHAR},'%')
+    and (ifnull(t.ord_no,'*') like concat('%',#{param12,jdbcType=VARCHAR},'%')
+    <if test="param17 != null and param17.size() !=0" >
+      OR ifnull(t.ord_no,'*') IN <foreach  item="item" collection="param17" index="index"  open="(" separator="," close=")">
+      #{item,jdbcType=VARCHAR}  </foreach>
+    </if>)
     and ifnull(t.car_no,'*') like concat('%',#{param13,jdbcType=VARCHAR},'%')
     and ((t.belong_id=#{param11,jdbcType=VARCHAR} and  t.ware_name in (
             select b.name from t_maint_userware a ,t_maint_ware b  where a.ware_id = b.id
@@ -345,6 +354,7 @@
             )  or t.customer_name like CONCAT((select attr3 from sys_user temp where temp.id=#{param10,jdbcType=VARCHAR}),'%') )
     and ifnull(t.tally_people,'*') like concat('%',#{param14,jdbcType=VARCHAR},'%')
     and ifnull(a.name,'*') like concat('%',#{param15,jdbcType=VARCHAR},'%')
+    AND ifnull(t.remark1,'*') like concat('%',#{param18,jdbcType=VARCHAR},'%')
     order by t.add_time desc
   </select>
 
@@ -362,10 +372,19 @@
     <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.cancel_flag = '0'
-    and ifnull(t.ord_no,'*') like concat('%',#{param12,jdbcType=VARCHAR},'%')
+    and (ifnull(t.ord_no,'*') like concat('%',#{param12,jdbcType=VARCHAR},'%')
+    <if test="param17 != null and param17.size() !=0" >
+      OR ifnull(t.ord_no,'*') IN <foreach  item="item" collection="param17" index="index"  open="(" separator="," close=")">
+      #{item,jdbcType=VARCHAR}  </foreach>
+    </if>)
     and ifnull(t.car_no,'*') like concat('%',#{param13,jdbcType=VARCHAR},'%')
     and ((t.belong_id=#{param11,jdbcType=VARCHAR} and t.ware_name in (
             select b.name from t_maint_userware a ,t_maint_ware b  where a.ware_id = b.id
@@ -373,6 +392,7 @@
             )  or t.customer_name like CONCAT((select attr3 from sys_user temp where temp.id=#{param10,jdbcType=VARCHAR}),'%') )
     and ifnull(t.tally_people,'*') like concat('%',#{param14,jdbcType=VARCHAR},'%')
     and ifnull(a.name,'*') like concat('%',#{param15,jdbcType=VARCHAR},'%')
+    AND ifnull(t.remark1,'*') like concat('%',#{param18,jdbcType=VARCHAR},'%')
     order by t.add_time desc
   </select>
 

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

@@ -558,4 +558,12 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
     update  t_ware_store t set t.fk_compony_id = #{fkComponyId,jdbcType=VARCHAR}
     where t.id = #{id,jdbcType=VARCHAR}
   </update>
+
+  <select id="selectByInId" resultType="java.lang.Integer" parameterType="java.lang.String">
+    select COUNT(*)
+    from t_ware_store t
+    where t.cancel_flag = '0'
+      and t.in_id = #{param1,jdbcType=VARCHAR};
+
+  </select>
 </mapper>