111

src/main/java/com/th/demo/controller/maint/CargoController.java

@@ -4,12 +4,14 @@ import com.th.demo.model.system.ResponseCodeMsg;
 import com.th.demo.model.system.Type;
 import com.th.demo.service.maint.AreaService;
 import com.th.demo.service.maint.CargoService;
+import com.th.demo.tools.DateTools;
 import com.th.demo.tools.JSONTools;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
 
 @RestController
 @RequestMapping(value = "/MaintCargo")
@@ -63,12 +65,23 @@ public class CargoController {
     }
 
     @RequestMapping(value = "/queryRecord.do")
-    public String queryRecord(int page, int rows,String uperCustomer, String Customer ,HttpServletRequest request) {
+    public String queryRecord(int page, int rows,String uperCustomer, String Customer,
+            String RecordDateBegin,String RecordDateEnd,String subStr,String changeFrom,
+                              HttpServletRequest request) {
 
         try {
+            Date fromDate2 = new Date();
+            Date toDate2 = new Date();
+            if (RecordDateBegin != null && RecordDateBegin!= ""){
+                fromDate2 = DateTools.StrToDate(RecordDateBegin, "yyyy-MM-dd HH:mm:ss");
+            }
+            if (RecordDateEnd != null && RecordDateEnd != ""){
+                toDate2 = DateTools.StrToDate(RecordDateEnd, "yyyy-MM-dd HH:mm:ss");
+            }
+
             String userId = (String) request.getAttribute("userId");
             String belongId = (String) request.getAttribute("belongId");
-            result = cargoService.queryRecord(page,rows,uperCustomer,Customer,userId,belongId);
+            result = cargoService.queryRecord(page,rows,uperCustomer,Customer,fromDate2,toDate2,subStr,changeFrom,userId,belongId);
         } catch (Exception ex) {
             ex.printStackTrace();
             result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());

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

@@ -117,5 +117,22 @@ public class InRecordController {
             return result;
         }
     }
+    @RequestMapping(value = "/changeRecordInDtm.do")
+    public String changeRecordInDtm(String json, String ChangeInDtm,
+                               HttpServletRequest request) {
+
+        try {
+            String userId = (String) request.getAttribute("userId");
+            String belongId = (String) request.getAttribute("belongId");
+            Date fromDate2 = DateTools.StrToDate(ChangeInDtm, "yyyy-MM-dd HH:mm:ss");
+
+            result = inRecordService.changeRecordInDtm(json ,fromDate2, 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/CargoChangeRecordMapper.java

@@ -15,7 +15,8 @@ public interface CargoChangeRecordMapper {
 
     CargoChangeRecord selectByCustomer(String uperCustomer, String Customer);
 
-    List<CargoChangeRecord> selectRecord(String uperCustomer, String Customer);
+    List<CargoChangeRecord> selectRecord(String uperCustomer, String Customer,
+                                         Date RecordDateBegin,Date RecordDateEnd,String subStr,String changeFrom);
 
 
 

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

@@ -35,4 +35,7 @@ public interface InRecordMapper {
                                   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);
+
+
+    int updateInDtmByInId(String id,Date ChangeInDtm);
 }

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

@@ -7,6 +7,7 @@ import com.th.demo.model.ware.TotalRecord;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Date;
 
 public interface StoreMapper {
     int deleteByPrimaryKey(String id);
@@ -58,4 +59,6 @@ public interface StoreMapper {
 
     int selectByInId(String id);
     int selectByOutIdNum(String id);
+
+    int updateInDtmByInId(String id,Date ChangeInDtm);
 }

src/main/java/com/th/demo/service/impl/maint/CargoServiceImpl.java

@@ -124,9 +124,11 @@ public class CargoServiceImpl implements CargoService {
     }
 
     @Override
-    public String queryRecord(int page, int rows, String uperCustomer, String Customer ,String userId, String belongId) {
+    public String queryRecord(int page, int rows, String uperCustomer, String Customer ,
+                              Date RecordDateBegin,Date RecordDateEnd,String subStr,String changeFrom,
+                              String userId, String belongId) {
         PageHelper.startPage(page, rows);
-        List<CargoChangeRecord> list   = cargoChangeRecordMapper.selectRecord(uperCustomer, Customer);
+        List<CargoChangeRecord> list   = cargoChangeRecordMapper.selectRecord(uperCustomer, Customer,RecordDateBegin,RecordDateEnd,subStr,changeFrom);
         PageInfo<CargoChangeRecord> pageInfo = new PageInfo<>(list);
         result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
         return result;

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

@@ -71,10 +71,11 @@ public class ChangeServiceImpl implements ChangeService {
             sum_weight=0;
         }else{
             if(cargo.getSumWeight() == 0){
-                num =10;
+                num = 10;
                 return JSONTools.toString(1,"货权信息已维护，但可是用量为0");
+            }else {
+                sum_weight = cargo.getSumWeight();
             }
-            sum_weight = cargo.getSumWeight();
         }
 
         for (int i = 0; i < list.size(); i++) {
@@ -100,11 +101,10 @@ public class ChangeServiceImpl implements ChangeService {
             num += storeMapper.updateFkById(list.get(i));
             use_weight = use_weight + list.get(i).getWeight();
         }
-        if (sum_weight != 0){
+        if (cargo != null){
             cargo.setSumWeight(cargo.getSumWeight() - use_weight);
             cargo.setUseWeight(cargo.getUseWeight() + use_weight);
             num = cargoMapper.updateByPrimaryKey(cargo);
-            result = Tools.moreThanZeroResultJSON(num);
 
             CargoChangeRecord cargoChangeRecord = new CargoChangeRecord();
             cargoChangeRecord.setUperCustomer(cargo.getUperCustomer());
@@ -116,10 +116,10 @@ public class ChangeServiceImpl implements ChangeService {
             cargoChangeRecord.setModifyTime(new Date());
             cargoChangeRecord.setModifyUser(new SysUser(userId));
             num = cargoChangeRecordMapper.insert(cargoChangeRecord);
-            result = Tools.moreThanZeroResultJSON(num);
-        }
 
-        return Tools.moreThanZeroResultJSON(num);
+        }
+        result = Tools.moreThanZeroResultJSON(num);
+        return result;
     }
 
     private ChangeRecord getChangeRecord(String recordType, Store store, Customer customer, String receiveAddress, String userId, String belongId) {

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

@@ -108,4 +108,17 @@ public class InRecordServiceImpl implements InRecordService {
 
         return result;
     }
+
+    @Override
+    public String changeRecordInDtm(String json,Date ChangeInDtm, 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.updateInDtmByInId(inRecord.get(i).getId(),ChangeInDtm);
+            num =inRecordMapper.updateInDtmByInId(inRecord.get(i).getId(),ChangeInDtm);
+            result = JSONTools.toString(num);
+        }
+
+        return result;
+    }
 }

src/main/java/com/th/demo/service/maint/CargoService.java

@@ -1,5 +1,6 @@
 package com.th.demo.service.maint;
 
+import java.util.Date;
 public interface CargoService {
     String query(int page, int rows, String uperCustomer, String Customer ,String userId, String belongId);
 
@@ -7,5 +8,7 @@ public interface CargoService {
 
     String remove(String id, String userId, String belongId);
 
-    String queryRecord(int page, int rows, String uperCustomer, String Customer ,String userId, String belongId);
+    String queryRecord(int page, int rows, String uperCustomer, String Customer ,
+                       Date RecordDateBegin,Date RecordDateEnd,String subStr,String changeFrom,
+                       String userId, String belongId);
 }

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

@@ -14,4 +14,5 @@ public interface InRecordService {
                       String tallyPeople, String fkComponyName, String remark1);
 
     String deleterecord(String json, String userId, String belongId);
+    String changeRecordInDtm(String json,  Date ChangeInDtm,String userId, String belongId);
 }

src/main/resource/localhost/db.properties

@@ -4,12 +4,12 @@
 #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.jdbcUrl=jdbc:mysql://localhost:3306/ware_mj?characterEncoding=utf8
 jdbc.user=root
-jdbc.password=122403
+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
+#jdbc.password=122403

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

@@ -61,6 +61,13 @@
     from t_ware_cargochange_record
     where uper_customer_id = #{param1,jdbcType=VARCHAR}
     and customer_id = #{param2,jdbcType=VARCHAR}
+    and modify_time between #{param3,jdbcType=TIMESTAMP} and #{param4,jdbcType=TIMESTAMP}
+    <if test="param5 != null and param5 != ''" >
+      and sub_str like concat('%',#{param5,jdbcType=VARCHAR},'%')
+    </if>
+    <if test="param6 != null and param6 != ''" >
+      and change_from like concat('%',#{param6,jdbcType=VARCHAR},'%')
+    </if>
     order by modify_time desc
   </select>
 

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

@@ -396,4 +396,10 @@
     order by t.add_time desc
   </select>
 
+  <update id="updateInDtmByInId" >
+    update t_ware_in_record
+    set add_time = #{param2,jdbcType=TIMESTAMP}
+    where id = #{param1,jdbcType=VARCHAR}
+  </update>
+
 </mapper>

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

@@ -575,4 +575,10 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
       and t.out_id = #{param1,jdbcType=VARCHAR};
 
   </select>
+
+  <update id="updateInDtmByInId" >
+    update t_ware_store
+    set add_time = #{param2,jdbcType=TIMESTAMP}
+    where in_id = #{param1,jdbcType=VARCHAR}
+  </update>
 </mapper>