改的太杂，懒得备注，同步一下信息

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

@@ -21,6 +21,9 @@ public class CargoChangeRecord {
     private Customer uperCustomer;
     private Customer Customer;
 
+    private String ordNo;
+    private String remark;
+
     public String getId() {
         return id;
     }
@@ -84,4 +87,20 @@ public class CargoChangeRecord {
     public void setCustomer(Customer customer) {
         Customer = customer;
     }
+
+    public String getOrdNo() {
+        return ordNo;
+    }
+
+    public void setOrdNo(String ordNo) {
+        this.ordNo = ordNo;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }

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

@@ -99,6 +99,8 @@ public class CargoServiceImpl implements CargoService {
         cargoChangeRecord.setCustomer(downCust);
         cargoChangeRecord.setChangeFrom("手动调整");
         cargoChangeRecord.setWeight(weight);
+        cargoChangeRecord.setOrdNo(object.get("ordNo").toString());
+        cargoChangeRecord.setRemark(object.get("remark").toString());
         if (subChange.equals("up")){
             cargoChangeRecord.setSubStr("增加");
         }

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

@@ -5,6 +5,7 @@ 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.CustomerMapper;
 import com.th.demo.mapping.maint.PriceMapper;
 import com.th.demo.mapping.maint.StackMapper;
 import com.th.demo.mapping.ware.ChangeRecordMapper;
@@ -46,6 +47,8 @@ public class ChangeServiceImpl implements ChangeService {
     public CargoMapper cargoMapper;
     @Autowired
     public CargoChangeRecordMapper cargoChangeRecordMapper;
+    @Autowired
+    public CustomerMapper customerMapper;
 
     int num = 0;
     String result = Type.FAIL;
@@ -55,21 +58,23 @@ public class ChangeServiceImpl implements ChangeService {
     @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>() {});
+        Customer c1 = JSON.parseObject(customer, new TypeReference<Customer>() {});
+        Customer c = customerMapper.selectByPrimaryKey(c1.getId());//新货主
         String recordType = "";
         double sum_weight = 0;//可以进行货权转移的重量(货权转移的地方维护的)
         double use_weight = 0;//已经使用的货权转移的重量
         // 增加校验
-        Cargo cargo = cargoMapper.selectByByFkAndCustomer(list.get(0).getFkComponyId(),c.getId(),belongId);
+        Customer fk_cus = customerMapper.selectByPrimaryKey(list.get(0).getCustomer().getId());//老货主
+        Cargo cargo = cargoMapper.selectByByFkAndCustomer(fk_cus.getId(),c.getId(),belongId);
         if (cargo == null){
-            num =10;
-            return JSONTools.toString(1,"未维护两个单位之间货权转移重量");
+            sum_weight=0;
         }else{
             sum_weight = cargo.getSumWeight();
         }
 
         for (int i = 0; i < list.size(); i++) {
-            if((sum_weight-use_weight-list.get(i).getWeight()) < 0){
+            //保留可转移重量不为0的情况下，货权转移重量的计算
+            if(sum_weight != 0 && (sum_weight-use_weight-list.get(i).getWeight()) < 0){
                 num =10;
                 return JSONTools.toString(1,"权转移重量不足");
             }
@@ -83,27 +88,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).setFkComponyId(fk_cus.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);
+        if (sum_weight != 0){
+            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/resource/mapper/ware/CargoChangeRecordMapper.xml

@@ -7,6 +7,8 @@
     <result column="weight" property="weight" jdbcType="DOUBLE" />
     <result column="change_from" property="changeFrom" jdbcType="VARCHAR"/>
     <result column="sub_str" property="subStr" jdbcType="VARCHAR"/>
+    <result column="ord_no" property="ordNo" jdbcType="VARCHAR"/>
+    <result column="remark" property="remark" 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" />
@@ -14,7 +16,7 @@
   </resultMap>
 
   <sql id="Base_Column_List" >
-    id, modify_id, modify_time, weight, change_from, sub_str, uper_customer_id, customer_id
+    id, modify_id, modify_time, weight, change_from, sub_str, uper_customer_id, customer_id,ord_no,remark
   </sql>
 
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
@@ -37,10 +39,12 @@
 
     insert into t_ware_cargochange_record (id, modify_id, modify_time,
                                            weight, change_from, sub_str,
-                                           uper_customer_id, customer_id )
+                                           uper_customer_id, customer_id,
+                                           ord_no,remark)
     values (#{id,jdbcType=VARCHAR},#{modifyUser.id,jdbcType=VARCHAR},#{modifyTime,jdbcType=TIMESTAMP},
             #{weight,jdbcType=DOUBLE},#{changeFrom,jdbcType=VARCHAR},#{subStr,jdbcType=VARCHAR},
-            #{uperCustomer.id,jdbcType=VARCHAR}, #{Customer.id,jdbcType=VARCHAR})
+            #{uperCustomer.id,jdbcType=VARCHAR}, #{Customer.id,jdbcType=VARCHAR},
+            #{ordNo,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR})
   </insert>
 
   <select id="selectByCustomer" resultMap="BaseResultMap" parameterType="java.lang.String" >

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

@@ -234,7 +234,7 @@
       cancel_flag = #{cancelFlag,jdbcType=VARCHAR},
       belong_id = #{belongId,jdbcType=VARCHAR},
       delivery_company = #{deliveryCompany,jdbcType=VARCHAR},
-      distribution_no =ifnull(distribution_no,(select dis_no from (select concat('BS',DATE_FORMAT(NOW(), '%Y%m%d'),IFNULL(lpad(max(substring(t.distribution_no,11,3)+1),3,'0'),'001')) as dis_no from t_ware_distribution t
+      distribution_no =ifnull(distribution_no,(select dis_no from (select concat('MJ',DATE_FORMAT(NOW(), '%Y%m%d'),IFNULL(lpad(max(substring(t.distribution_no,11,3)+1),3,'0'),'001')) as dis_no from t_ware_distribution t
 where substring(t.distribution_no,3,8) = DATE_FORMAT(NOW(), '%Y%m%d')) temp))
       ,tally_people    = #{tallyPeople,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}

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

@@ -432,11 +432,11 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
 
 
   <select id="selectStore" resultMap="BaseResultMap" >
-    select t.* from t_ware_store t, t_maint_ware a, t_maint_stack b, t_maint_material c,t_maint_customer d
+    select d.name as fk_compony_id,t.* from t_ware_store t, t_maint_ware a, t_maint_stack b, t_maint_material c,t_maint_customer d
     where t.ware_id = a.id
     and t.stack_id = b.id
     and t.material_id  = c.id
-    and t.customer_id = d.id
+    and t.fk_compony_id = d.id
     and  a.name like concat('%',#{param1,jdbcType=VARCHAR},'%')
     and  b.name like concat('%',#{param2,jdbcType=VARCHAR},'%')
     and  t.model like concat('%',#{param3,jdbcType=VARCHAR},'%')