111

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

@@ -61,4 +61,20 @@ public class CargoController {
             return result;
         }
     }
+
+    @RequestMapping(value = "/queryRecord.do")
+    public String queryRecord(int page, int rows,String uperCustomer, String Customer ,HttpServletRequest request) {
+
+        try {
+            String userId = (String) request.getAttribute("userId");
+            String belongId = (String) request.getAttribute("belongId");
+            result = cargoService.queryRecord(page,rows,uperCustomer,Customer,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

@@ -1,6 +1,9 @@
 package com.th.demo.mapping.ware;
 
 import com.th.demo.model.ware.CargoChangeRecord;
+import java.util.Date;
+import java.util.List;
+
 
 public interface CargoChangeRecordMapper {
 
@@ -12,6 +15,8 @@ public interface CargoChangeRecordMapper {
 
     CargoChangeRecord selectByCustomer(String uperCustomer, String Customer);
 
+    List<CargoChangeRecord> selectRecord(String uperCustomer, String Customer);
+
 
 
 }

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

@@ -18,7 +18,7 @@ public class CargoChangeRecord {
 
     private String subStr;  //变动情况 1、增加 2、减少
 
-    private com.th.demo.model.maint.Customer uperCustomer;
+    private Customer uperCustomer;
     private Customer Customer;
 
     public String getId() {
@@ -69,19 +69,19 @@ public class CargoChangeRecord {
         this.subStr = subStr;
     }
 
-    public com.th.demo.model.maint.Customer getUperCustomer() {
+    public Customer getUperCustomer() {
         return uperCustomer;
     }
 
-    public void setUperCustomer(com.th.demo.model.maint.Customer uperCustomer) {
+    public void setUperCustomer(Customer uperCustomer) {
         this.uperCustomer = uperCustomer;
     }
 
-    public com.th.demo.model.maint.Customer getCustomer() {
+    public Customer getCustomer() {
         return Customer;
     }
 
-    public void setCustomer(com.th.demo.model.maint.Customer customer) {
+    public void setCustomer(Customer customer) {
         Customer = customer;
     }
 }

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

@@ -7,11 +7,14 @@ import com.github.pagehelper.PageInfo;
 import com.th.demo.mapping.maint.AreaMapper;
 import com.th.demo.mapping.maint.CargoMapper;
 import com.th.demo.mapping.maint.CustomerMapper;
+import com.th.demo.mapping.ware.CargoChangeRecordMapper;
 import com.th.demo.model.maint.Customer;
 import com.th.demo.model.maint.Area;
 import com.th.demo.model.maint.Cargo;
 import com.th.demo.model.maint.Ware;
+import com.th.demo.model.system.SysUser;
 import com.th.demo.model.system.Type;
+import com.th.demo.model.ware.CargoChangeRecord;
 import com.th.demo.service.maint.CargoService;
 import com.th.demo.tools.JSONTools;
 import com.th.demo.tools.Tools;
@@ -27,6 +30,8 @@ public class CargoServiceImpl implements CargoService {
     public CargoMapper cargoMapper;
     @Autowired
     public CustomerMapper customerMapper;
+    @Autowired
+    public CargoChangeRecordMapper cargoChangeRecordMapper;
 
     String result = Type.FAIL;
     int num = 0;
@@ -89,6 +94,23 @@ public class CargoServiceImpl implements CargoService {
             num = cargoMapper.updateByPrimaryKey(cargo);
             result = Tools.moreThanZeroResultJSON(num);
         }
+        CargoChangeRecord cargoChangeRecord = new CargoChangeRecord();
+        cargoChangeRecord.setUperCustomer(uperCust);
+        cargoChangeRecord.setCustomer(downCust);
+        cargoChangeRecord.setChangeFrom("手动调整");
+        cargoChangeRecord.setWeight(weight);
+        if (subChange.equals("up")){
+            cargoChangeRecord.setSubStr("增加");
+        }
+        if (subChange.equals("down")){
+            cargoChangeRecord.setSubStr("减少");
+        }
+
+        cargoChangeRecord.setModifyTime(new Date());
+        cargoChangeRecord.setModifyUser(new SysUser(userId));
+        num = cargoChangeRecordMapper.insert(cargoChangeRecord);
+        result = Tools.moreThanZeroResultJSON(num);
+
         return result;
     }
 
@@ -98,4 +120,13 @@ public class CargoServiceImpl implements CargoService {
         result = Tools.moreThanZeroResultJSON(num);
         return result;
     }
+
+    @Override
+    public String queryRecord(int page, int rows, String uperCustomer, String Customer ,String userId, String belongId) {
+        PageHelper.startPage(page, rows);
+        List<CargoChangeRecord> list   = cargoChangeRecordMapper.selectRecord(uperCustomer, Customer);
+        PageInfo<CargoChangeRecord> pageInfo = new PageInfo<>(list);
+        result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
+        return result;
+    }
 }

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

@@ -1,14 +1,18 @@
 package com.th.demo.service.impl.ware;
 
+import com.alibaba.druid.sql.visitor.functions.If;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
 import com.th.demo.mapping.finance.AccountDetailMapper;
+import com.th.demo.mapping.maint.CargoMapper;
 import com.th.demo.mapping.maint.PriceMapper;
 import com.th.demo.mapping.maint.StackMapper;
 import com.th.demo.mapping.ware.ChangeRecordMapper;
+import com.th.demo.mapping.ware.CargoChangeRecordMapper;
 import com.th.demo.mapping.ware.CombineRecordMapper;
 import com.th.demo.mapping.ware.StoreMapper;
 import com.th.demo.model.finance.AccountDetail;
+import com.th.demo.model.maint.Cargo;
 import com.th.demo.model.maint.Customer;
 import com.th.demo.model.maint.Price;
 import com.th.demo.model.maint.Stack;
@@ -38,6 +42,10 @@ public class ChangeServiceImpl implements ChangeService {
     public PriceMapper priceMapper;
     @Autowired
     public StoreMapper storeMapper;
+    @Autowired
+    public CargoMapper cargoMapper;
+    @Autowired
+    public CargoChangeRecordMapper cargoChangeRecordMapper;
 
     int num = 0;
     String result = Type.FAIL;
@@ -46,12 +54,25 @@ public class ChangeServiceImpl implements ChangeService {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public String changeCustomer(String json, String customer,String address,String userId, String belongId) throws Exception{
-        List<Store> list = JSON.parseObject(json, new TypeReference<List<Store>>() {
-        });
-        Customer c = JSON.parseObject(customer, new TypeReference<Customer>() {
-        });
+        List<Store> list = JSON.parseObject(json, new TypeReference<List<Store>>() {});
+        Customer c = JSON.parseObject(customer, new TypeReference<Customer>() {});
         String recordType = "";
+        double sum_weight = 0;//可以进行货权转移的重量(货权转移的地方维护的)
+        double use_weight = 0;//已经使用的货权转移的重量
+        // 增加校验
+        Cargo cargo = cargoMapper.selectByByFkAndCustomer(list.get(0).getFkComponyId(),c.getId(),belongId);
+        if (cargo == null){
+            num =10;
+            return JSONTools.toString(1,"未维护两个单位之间货权转移重量");
+        }else{
+            sum_weight = cargo.getSumWeight();
+        }
+
         for (int i = 0; i < list.size(); i++) {
+            if((sum_weight-use_weight-list.get(i).getWeight()) < 0){
+                num =10;
+                return JSONTools.toString(1,"权转移重量不足");
+            }
             if(list.get(i).getCustomer().getName().equals(c.getName())){
                 recordType = "0";
             }else {
@@ -61,12 +82,30 @@ public class ChangeServiceImpl implements ChangeService {
             }
             ChangeRecord changeRecord = getChangeRecord(recordType, list.get(i), c, address, userId, belongId);
             num += changeRecordMapper.insert(changeRecord);
-
-
             list.get(i).setCustomer(c);
+            list.get(i).setFkComponyId(c.getId());
             list.get(i).setReceiveAddress(address);
             num += storeMapper.updateByPrimaryKey(list.get(i));
+            use_weight = use_weight + list.get(i).getWeight();
         }
+        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());
+        cargoChangeRecord.setCustomer(cargo.getCustomer());
+        cargoChangeRecord.setChangeFrom("货权转移");
+        cargoChangeRecord.setWeight(use_weight);
+        cargoChangeRecord.setSubStr("减少");
+
+        cargoChangeRecord.setModifyTime(new Date());
+        cargoChangeRecord.setModifyUser(new SysUser(userId));
+        num = cargoChangeRecordMapper.insert(cargoChangeRecord);
+        result = Tools.moreThanZeroResultJSON(num);
+
+
         return Tools.moreThanZeroResultJSON(num);
     }
 

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

@@ -6,4 +6,6 @@ public interface CargoService {
     String save(String json, String userId, String belongId);
 
     String remove(String id, String userId, String belongId);
+
+    String queryRecord(int page, int rows, String uperCustomer, String Customer ,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/thware?useUnicode=true&characterEncoding=utf8
 #jdbc.user=root

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

@@ -5,8 +5,8 @@
     <id column="id" property="id" jdbcType="VARCHAR" />
     <result column="modify_time" property="modifyTime" jdbcType="TIMESTAMP" />
     <result column="weight" property="weight" jdbcType="DOUBLE" />
-    <result column="change_from" property="changeFrom" javaType="VARCHAR"/>
-    <result column="sub_str" property="subStr" javaType="VARCHAR"/>
+    <result column="change_from" property="changeFrom" jdbcType="VARCHAR"/>
+    <result column="sub_str" property="subStr" jdbcType="VARCHAR"/>
 
     <association  column="modify_id" property="modifyUser" select="com.th.demo.mapping.system.SysUserMapper.selectByPrimaryKey" />
     <association  column="uper_customer_id" property="uperCustomer" select="com.th.demo.mapping.maint.CustomerMapper.selectByPrimaryKey" />
@@ -44,11 +44,19 @@
   </insert>
 
   <select id="selectByCustomer" resultMap="BaseResultMap" parameterType="java.lang.String" >
+  select
+  <include refid="Base_Column_List" />
+  from t_ware_cargochange_record
+  where uper_customer_id = #{param1,jdbcType=VARCHAR}
+  and customer_id = #{param2,jdbcType=VARCHAR}
+</select>
+
+  <select id="selectRecord" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select
     <include refid="Base_Column_List" />
     from t_ware_cargochange_record
     where uper_customer_id = #{param1,jdbcType=VARCHAR}
-      and customer_id = #{param2,jdbcType=VARCHAR}
+    and customer_id = #{param2,jdbcType=VARCHAR}
   </select>
 
 

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

@@ -330,7 +330,8 @@
       out_flag = #{outFlag,jdbcType=VARCHAR},
       lock_flag = #{lockFlag,jdbcType=VARCHAR},
       contract_no = #{contractNo,jdbcType=VARCHAR},
-      remark1 = #{remark1,jdbcType=VARCHAR}
+      remark1 = #{remark1,jdbcType=VARCHAR},
+      fk_compony_id = #{fkComponyId,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>