111

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

@@ -0,0 +1,17 @@
+package com.th.demo.mapping.ware;
+
+import com.th.demo.model.ware.CargoChangeRecord;
+
+public interface CargoChangeRecordMapper {
+
+    CargoChangeRecord selectByPrimaryKey(String id);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(CargoChangeRecord record);
+
+    CargoChangeRecord selectByCustomer(String uperCustomer, String Customer);
+
+
+
+}

src/main/java/com/th/demo/model/maint/Cargo.java

@@ -6,6 +6,7 @@ public class Cargo {
     private Customer uperCustomer;
     private Customer Customer;
     private double sumWeight;
+    private double useWeight;
     private String belongId;
 
     public String getId() {
@@ -47,4 +48,12 @@ public class Cargo {
     public void setBelongId(String belongId) {
         this.belongId = belongId;
     }
+
+    public double getUseWeight() {
+        return useWeight;
+    }
+
+    public void setUseWeight(double useWeight) {
+        this.useWeight = useWeight;
+    }
 }

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

@@ -0,0 +1,87 @@
+package com.th.demo.model.ware;
+
+import com.th.demo.model.maint.Customer;
+import com.th.demo.model.system.SysUser;
+
+import java.util.Date;
+
+public class CargoChangeRecord {
+    private String id; // 主键
+
+    private SysUser modifyUser; // 修改人员
+
+    private Date modifyTime; //修改时间
+
+    private Double weight; // 修改重量
+
+    private String changeFrom;  //修改的源头 1、手动调整 2、货权转移 3、取消货权转移
+
+    private String subStr;  //变动情况 1、增加 2、减少
+
+    private com.th.demo.model.maint.Customer uperCustomer;
+    private Customer Customer;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public SysUser getModifyUser() {
+        return modifyUser;
+    }
+
+    public void setModifyUser(SysUser modifyUser) {
+        this.modifyUser = modifyUser;
+    }
+
+    public Date getModifyTime() {
+        return modifyTime;
+    }
+
+    public void setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
+    public Double getWeight() {
+        return weight;
+    }
+
+    public void setWeight(Double weight) {
+        this.weight = weight;
+    }
+
+    public String getChangeFrom() {
+        return changeFrom;
+    }
+
+    public void setChangeFrom(String changeFrom) {
+        this.changeFrom = changeFrom;
+    }
+
+    public String getSubStr() {
+        return subStr;
+    }
+
+    public void setSubStr(String subStr) {
+        this.subStr = subStr;
+    }
+
+    public com.th.demo.model.maint.Customer getUperCustomer() {
+        return uperCustomer;
+    }
+
+    public void setUperCustomer(com.th.demo.model.maint.Customer uperCustomer) {
+        this.uperCustomer = uperCustomer;
+    }
+
+    public com.th.demo.model.maint.Customer getCustomer() {
+        return Customer;
+    }
+
+    public void setCustomer(com.th.demo.model.maint.Customer customer) {
+        Customer = customer;
+    }
+}

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/maint/CargoMapper.xml

@@ -4,6 +4,7 @@
     <resultMap id="BaseResultMap" type="com.th.demo.model.maint.Cargo" >
         <id column="id" property="id" jdbcType="VARCHAR" />
         <result column="sum_weight" property="sumWeight" jdbcType="DOUBLE" />
+        <result column="use_weight" property="useWeight" jdbcType="DOUBLE" />
         <result column="belong_id" property="belongId" jdbcType="DOUBLE" />
 
         <association  column="uper_customer_id" property="uperCustomer" select="com.th.demo.mapping.maint.CustomerMapper.selectByPrimaryKey" />
@@ -11,7 +12,7 @@
     </resultMap>
 
     <sql id="Base_Column_List" >
-        id, uper_customer_id, customer_id, sum_weight, belong_id
+        id, uper_customer_id, customer_id, sum_weight,use_weight,belong_id
     </sql>
 
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
@@ -26,6 +27,7 @@
         set uper_customer_id = #{uperCustomer.id ,jdbcType=VARCHAR},
             customer_id = #{Customer.id ,jdbcType=VARCHAR},
             sum_weight = #{sumWeight,jdbcType=DOUBLE},
+            use_weight = #{useWeight,jdbcType=DOUBLE},
             belong_id = #{belongId,jdbcType=VARCHAR}
         where id = #{id,jdbcType=VARCHAR}
     </update>

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

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.th.demo.mapping.ware.CargoChangeRecordMapper" >
+  <resultMap id="BaseResultMap" type="com.th.demo.model.ware.CargoChangeRecord" >
+    <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"/>
+
+    <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" />
+    <association  column="customer_id" property="Customer" select="com.th.demo.mapping.maint.CustomerMapper.selectByPrimaryKey" />
+  </resultMap>
+
+  <sql id="Base_Column_List" >
+    id, modify_id, modify_time, weight, change_from, sub_str, uper_customer_id, customer_id
+  </sql>
+
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from t_ware_cargochange_record
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from t_ware_cargochange_record
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+
+  <insert id="insert" parameterType="com.th.demo.model.ware.CargoChangeRecord" >
+
+    <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.String">
+      SELECT  REPLACE(UUID(),'-','') as id from dual
+    </selectKey>
+
+    insert into t_ware_cargochange_record (id, modify_id, modify_time,
+                                           weight, change_from, sub_str,
+                                           uper_customer_id, customer_id )
+    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})
+  </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>
+
+
+</mapper>