111

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

@@ -0,0 +1,64 @@
+package com.th.demo.controller.maint;
+
+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.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;
+
+@RestController
+@RequestMapping(value = "/MaintCargo")
+public class CargoController {
+    @Autowired
+    public CargoService cargoService;
+    String result = Type.FAIL;
+
+    @RequestMapping(value = "/queryAll.do")
+    public String queryAll(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.query(page,rows,uperCustomer,Customer,userId,belongId);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
+        } finally {
+            return result;
+        }
+    }
+
+    @RequestMapping(value = "/save.do")
+    public String save(String json ,HttpServletRequest request) {
+
+        try {
+            String userId = (String) request.getAttribute("userId");
+            String belongId = (String) request.getAttribute("belongId");
+            result = cargoService.save(json,userId,belongId);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
+        } finally {
+            return result;
+        }
+    }
+    @RequestMapping(value = "/remove.do")
+    public String remove(String id ,HttpServletRequest request) {
+
+        try {
+            String userId = (String) request.getAttribute("userId");
+            String belongId = (String) request.getAttribute("belongId");
+            result = cargoService.remove(id,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/maint/CargoMapper.java

@@ -5,13 +5,15 @@ import com.th.demo.model.maint.Cargo;
 import java.util.List;
 
 public interface CargoMapper {
-    Cargo selectByPrimaryKey(String id);
 
-    List<Cargo> selectByWareId(String wareId, String belongId);
+    List<Cargo> selectAll (String uperCustomer, String Customer ,String belongId);
+    Cargo selectByPrimaryKey(String id);
 
     int updateByPrimaryKey(Cargo cargo);
 
     int deleteByPrimaryKey(String id);
 
     int insert(Cargo cargo);
+
+    Cargo selectByByFkAndCustomer(String uperCustomer, String Customer,String belongId);
 }

src/main/java/com/th/demo/mapping/maint/CustomerMapper.java

@@ -24,4 +24,5 @@ public interface CustomerMapper {
     Customer selectByName(String customerName, String belongId);
 
     List<Customer> selectByUserId(String userId, String belongId);
+
 }

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 String belongId;
 
     public String getId() {
         return id;
@@ -38,4 +39,12 @@ public class Cargo {
     public void setSumWeight(double sumWeight) {
         this.sumWeight = sumWeight;
     }
+
+    public String getBelongId() {
+        return belongId;
+    }
+
+    public void setBelongId(String belongId) {
+        this.belongId = belongId;
+    }
 }

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

@@ -0,0 +1,101 @@
+package com.th.demo.service.impl.maint;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.PageHelper;
+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.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.Type;
+import com.th.demo.service.maint.CargoService;
+import com.th.demo.tools.JSONTools;
+import com.th.demo.tools.Tools;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service("CargoService")
+public class CargoServiceImpl implements CargoService {
+    @Autowired
+    public CargoMapper cargoMapper;
+    @Autowired
+    public CustomerMapper customerMapper;
+
+    String result = Type.FAIL;
+    int num = 0;
+
+
+    @Override
+    public String query(int page, int rows, String uperCustomer, String Customer ,String userId, String belongId) {
+        PageHelper.startPage(page, rows);
+        List<Cargo> list   = cargoMapper.selectAll(uperCustomer, Customer, belongId);
+        PageInfo<Cargo> pageInfo = new PageInfo<>(list);
+        result = JSONTools.toString(pageInfo);
+        return result;
+    }
+
+    @Override
+    public String save(String json, String userId, String belongId) {
+        result = Type.FAIL;
+        JSONObject object = JSON.parseObject(json);
+        String uperCustomer = object.get("uperCustomer").toString();
+        String downCustomer = object.get("Customer").toString();
+        Cargo cargo = cargoMapper.selectByByFkAndCustomer(uperCustomer, downCustomer, belongId);
+        Customer uperCust = customerMapper.selectByPrimaryKey(uperCustomer);
+        Customer downCust = customerMapper.selectByPrimaryKey(downCustomer);
+        String subChange = object.get("sub").toString();
+        if (object.get("weight").toString().equals("")){
+            return JSONTools.toString(1,"请确认重量信息");
+        }
+        Double weight = Double.parseDouble(object.get("weight").toString());
+        if (cargo == null){
+            if (subChange.equals("down")){
+                return JSONTools.toString(1,"新建信息请选择增加重量");
+            } else if (subChange.equals("")) {
+                return JSONTools.toString(1,"请选择修改类型");
+            }
+
+            cargo = new Cargo();
+            cargo.setUperCustomer(uperCust);
+            cargo.setCustomer(downCust);
+            cargo.setSumWeight(weight);
+            cargo.setBelongId(belongId);
+
+            num= cargoMapper.insert(cargo);
+
+            result = Tools.moreThanZeroResultJSON(num);
+
+        }
+        else{
+            if (subChange.equals("down")){
+                if (weight > cargo.getSumWeight()){
+                    return JSONTools.toString(1,"需要减少的重量不足，请确认后再进行操作");
+                }
+                cargo.setSumWeight(cargo.getSumWeight() - weight);
+            }else if (subChange.equals("up")){
+                cargo.setSumWeight(cargo.getSumWeight() + weight);
+            }else if (subChange.equals("")) {
+                return JSONTools.toString(1,"请选择修改类型");
+            }
+
+            // cargo.setBelongId(belongId);
+            num = cargoMapper.updateByPrimaryKey(cargo);
+            result = Tools.moreThanZeroResultJSON(num);
+        }
+        return result;
+    }
+
+    @Override
+    public String remove(String id, String userId, String belongId) {
+        num = cargoMapper.deleteByPrimaryKey(id);
+        result = Tools.moreThanZeroResultJSON(num);
+        return result;
+    }
+}

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

@@ -366,7 +366,7 @@ public class InServiceImpl implements InService {
                 customerName = listJO.get(i).get("货主").toString();
                 customer = customerMapper.selectByName(customerName, belongId);
                 if (customer == null) {
-                    err += "未找到名为\"" + customerName + "\"的订单客户名称；";
+                    err += "未找到名或简称为\"" + customerName + "\"的订单客户名称；";
                     throw new Exception(err);
                 }
                 store.setCustomer(customer);
@@ -377,7 +377,7 @@ public class InServiceImpl implements InService {
                 fk_compony_name = listJO.get(i).get("货主").toString();
                 fk_compony = customerMapper.selectByName(fk_compony_name, belongId);
                 if (customer == null) {
-                    err += "未找到名为\"" + customerName + "\"的客户名称；";
+                    err += "未找到名或简称为\"" + customerName + "\"的客户名称；";
                     throw new Exception(err);
                 }
                 store.setFkComponyId(fk_compony.getId());

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

@@ -0,0 +1,9 @@
+package com.th.demo.service.maint;
+
+public interface CargoService {
+    String query(int page, int rows, String uperCustomer, String Customer ,String userId, String belongId);
+
+    String save(String json, String userId, String belongId);
+
+    String remove(String id, 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/maint/CargoMapper.xml

@@ -4,50 +4,34 @@
     <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="belong_id" property="belongId" jdbcType="DOUBLE" />
 
         <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, ware_id, name, code, add_id, add_time, modify_id, modify_time, cancel_id, cancel_time,
-    cancel_flag, belong_id
+        id, uper_customer_id, customer_id, sum_weight, belong_id
     </sql>
 
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
         select
         <include refid="Base_Column_List" />
-        from t_maint_area
+        from t_maint_cargo
         where id = #{param1,jdbcType=VARCHAR}
     </select>
 
-    <select id="selectByWareId" resultMap="BaseResultMap" >
-        select t.*
-        from t_maint_area t
-        where t.ware_id =  #{param1,jdbcType=VARCHAR}
-          and   t.belong_id =  #{param2,jdbcType=VARCHAR}
-          and ifnull(t.cancel_flag,'0') = '0'
-        order by t.code
-    </select>
-
     <update id="updateByPrimaryKey" parameterType="com.th.demo.model.maint.Cargo" >
-        update t_maint_area
-        set ware_id = #{ware.id,jdbcType=VARCHAR},
-            name = #{name,jdbcType=VARCHAR},
-            code = #{code,jdbcType=VARCHAR},
-            add_id = #{addId,jdbcType=VARCHAR},
-            add_time = #{addTime,jdbcType=TIMESTAMP},
-            modify_id = #{modifyId,jdbcType=VARCHAR},
-            modify_time = #{modifyTime,jdbcType=TIMESTAMP},
-            cancel_id = #{cancelId,jdbcType=VARCHAR},
-            cancel_time = #{cancelTime,jdbcType=TIMESTAMP},
-            cancel_flag = #{cancelFlag,jdbcType=VARCHAR},
+        update t_maint_cargo
+        set uper_customer_id = #{uperCustomer.id ,jdbcType=VARCHAR},
+            customer_id = #{Customer.id ,jdbcType=VARCHAR},
+            sum_weight = #{sumWeight,jdbcType=DOUBLE},
             belong_id = #{belongId,jdbcType=VARCHAR}
         where id = #{id,jdbcType=VARCHAR}
     </update>
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
-        delete from t_maint_area
+        delete from t_maint_cargo
         where id = #{param1,jdbcType=VARCHAR}
     </delete>
 
@@ -57,70 +41,32 @@
         </selectKey>
 
 
-        insert into t_maint_area (id, ware_id, name,
-        code, add_id, add_time,
-        modify_id, modify_time, cancel_id,
-        cancel_time, cancel_flag, belong_id)
-        values (#{id,jdbcType=VARCHAR}, #{ware.id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
-        #{code,jdbcType=VARCHAR}, #{addId,jdbcType=VARCHAR}, #{addTime,jdbcType=TIMESTAMP},
-        #{modifyId,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{cancelId,jdbcType=VARCHAR},
-        #{cancelTime,jdbcType=TIMESTAMP}, #{cancelFlag,jdbcType=VARCHAR}, #{belongId,jdbcType=VARCHAR})
+        insert into t_maint_cargo (id, uper_customer_id, customer_id,
+        sum_weight, belong_id)
+        values (#{id,jdbcType=VARCHAR}, #{uperCustomer.id,jdbcType=VARCHAR}, #{Customer.id,jdbcType=VARCHAR},
+        #{sumWeight,jdbcType=DOUBLE}, #{belongId,jdbcType=VARCHAR})
     </insert>
 
+    <select id="selectAll" resultMap="BaseResultMap" >
+        select *
+        from t_maint_cargo
+        where 1=1
+        <if test="param1 != null and param1 != ''" >
+            and uper_customer_id = #{param1,jdbcType=VARCHAR}
+        </if>
+        <if test="param2 != null and param2 != ''" >
+            and customer_id = #{param2,jdbcType=VARCHAR}
+        </if>
+          and belong_id = #{param3,jdbcType=VARCHAR}
+    </select>
 
-    <update id="updateByPrimaryKeySelective" parameterType="com.th.demo.model.maint.Cargo" >
-        update t_maint_stack
-        <set >
-            <if test="wareId != null" >
-                ware_id = #{wareId,jdbcType=VARCHAR},
-            </if>
-            <if test="name != null" >
-                name = #{name,jdbcType=VARCHAR},
-            </if>
-            <if test="code != null" >
-                code = #{code,jdbcType=VARCHAR},
-            </if>
-            <if test="addId != null" >
-                add_id = #{addId,jdbcType=VARCHAR},
-            </if>
-            <if test="addTime != null" >
-                add_time = #{addTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="modifyId != null" >
-                modify_id = #{modifyId,jdbcType=VARCHAR},
-            </if>
-            <if test="modifyTime != null" >
-                modify_time = #{modifyTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="cancelId != null" >
-                cancel_id = #{cancelId,jdbcType=VARCHAR},
-            </if>
-            <if test="cancelTime != null" >
-                cancel_time = #{cancelTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="cancelFlag != null" >
-                cancel_flag = #{cancelFlag,jdbcType=VARCHAR},
-            </if>
-            <if test="belongId != null" >
-                belong_id = #{belongId,jdbcType=VARCHAR},
-            </if>
-        </set>
-        where id = #{id,jdbcType=VARCHAR}
-    </update>
-
-
-
-    <select id="selectByWareNameStackName" resultMap="BaseResultMap" >
-        select t.*
-        from t_maint_stack t ,t_maint_ware d
-        where t.ware_id = d.id
-          and d.id in  (
-            select  a.ware_id from t_maint_userware a where  a.user_id = #{param3,jdbcType=VARCHAR}
-        )  and d.name = #{param1,jdbcType=VARCHAR}
-          and t.name = #{param2,jdbcType=VARCHAR}
-          and   t.belong_id = #{param4,jdbcType=VARCHAR}
-          and ifnull(t.cancel_flag,'0') = '0'
-        order by t.code
+    <select id="selectByByFkAndCustomer" resultMap="BaseResultMap" >
+        select *
+        from t_maint_cargo
+        where 1=1
+          and uper_customer_id = #{param1,jdbcType=VARCHAR}
+          and customer_id = #{param2,jdbcType=VARCHAR}
+          and belong_id = #{param3,jdbcType=VARCHAR}
     </select>
 
 </mapper>

src/main/resource/mapper/maint/CustomerMapper.xml

@@ -215,7 +215,7 @@
   <select id="selectByName" resultMap="BaseResultMap" >
     select *
     from t_maint_customer
-    where name = #{param1,jdbcType=VARCHAR}
+    where (name = #{param1,jdbcType=VARCHAR} or code = #{param1,jdbcType=VARCHAR})
     and   belong_id = #{param2,jdbcType=VARCHAR}
     and ifnull(cancel_flag,'0') = '0'
   </select>
@@ -227,4 +227,5 @@
       and ifnull(cancel_flag,'0') = '0'
   </select>
 
+
 </mapper>