价格管理

sto/src/main/java/com/shinsoft/sto/controller/main/CargoChangeRecordController.java

@@ -0,0 +1,116 @@
+package com.shinsoft.sto.controller.main;
+
+import com.shinsoft.tools.JSONTools;
+import com.shinsoft.tools.model.common.ResponseCodeMsg;
+import com.shinsoft.tools.model.common.ResultJSON;
+import com.shinsoft.sto.service.main.CargoChangeRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/CargoChangeRecord")
+public class CargoChangeRecordController {
+
+    @Autowired
+    private CargoChangeRecordService cargoChangeRecordService;
+
+    ResultJSON resultJSON;
+
+    @RequestMapping(value = "/query")
+    public ResultJSON query(@RequestParam(defaultValue = "1") Integer page,
+                            @RequestParam(defaultValue = "10") Integer rows,
+                            @RequestParam(required = false) String uperCustomerId,
+                            @RequestParam(required = false) String customerId,
+                            @RequestParam(required = false) String startDate,
+                            @RequestParam(required = false) String endDate,
+                            @RequestParam(required = false) String subStr,
+                            @RequestParam(required = false) String changeFrom,
+                            HttpServletRequest request) {
+        try {
+            String userId = (String) request.getHeader("userId");
+            Map<String, Object> params = new HashMap<>();
+            if (uperCustomerId != null) {
+                params.put("uperCustomerId", uperCustomerId);
+            }
+            if (customerId != null) {
+                params.put("customerId", customerId);
+            }
+            if (startDate != null) {
+                params.put("startDate", startDate);
+            }
+            if (endDate != null) {
+                params.put("endDate", endDate);
+            }
+            if (subStr != null) {
+                params.put("subStr", subStr);
+            }
+            if (changeFrom != null) {
+                params.put("changeFrom", changeFrom);
+            }
+            resultJSON = cargoChangeRecordService.query(page, rows, params);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+        } finally {
+            return resultJSON;
+        }
+    }
+
+    @RequestMapping(value = "/queryByPK")
+    public ResultJSON queryByPK(@RequestParam String id, HttpServletRequest request) {
+        try {
+            String userId = (String) request.getHeader("userId");
+            resultJSON = cargoChangeRecordService.queryByPK(id);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+        } finally {
+            return resultJSON;
+        }
+    }
+
+    @RequestMapping(value = "/save")
+    public ResultJSON save(@RequestParam String json, HttpServletRequest request) {
+        try {
+            String userId = (String) request.getHeader("userId");
+            resultJSON = cargoChangeRecordService.save(userId, json);
+        } catch (Exception ex) {
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+            ex.printStackTrace();
+        } finally {
+            return resultJSON;
+        }
+    }
+
+    @RequestMapping(value = "/remove")
+    public ResultJSON remove(@RequestParam String id, HttpServletRequest request) {
+        try {
+            String userId = (String) request.getHeader("userId");
+            resultJSON = cargoChangeRecordService.remove(userId, id);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+        } finally {
+            return resultJSON;
+        }
+    }
+
+    @RequestMapping(value = "/removeBatch")
+    public ResultJSON removeBatch(@RequestParam String ids, HttpServletRequest request) {
+        try {
+            String userId = (String) request.getHeader("userId");
+            resultJSON = cargoChangeRecordService.removeBatch(userId, ids);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+        } finally {
+            return resultJSON;
+        }
+    }
+}

sto/src/main/java/com/shinsoft/sto/controller/main/CargoController.java

@@ -0,0 +1,113 @@
+package com.shinsoft.sto.controller.main;
+
+import com.shinsoft.tools.JSONTools;
+import com.shinsoft.tools.model.common.ResponseCodeMsg;
+import com.shinsoft.tools.model.common.ResultJSON;
+import com.shinsoft.sto.service.main.CargoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/Cargo")
+public class CargoController {
+
+    @Autowired
+    private CargoService cargoService;
+
+    ResultJSON resultJSON;
+
+    @RequestMapping(value = "/query")
+    public ResultJSON query(@RequestParam(defaultValue = "1") Integer page,
+                            @RequestParam(defaultValue = "10") Integer rows,
+                            @RequestParam(required = false) String uperCustomerId,
+                            @RequestParam(required = false) String customerId,
+                            HttpServletRequest request) {
+        try {
+            String userId = (String) request.getHeader("userId");
+            Map<String, Object> params = new HashMap<>();
+            if (uperCustomerId != null && !uperCustomerId.trim().isEmpty()) {
+                params.put("uperCustomerId", uperCustomerId);
+            }
+            if (customerId != null && !customerId.trim().isEmpty()) {
+                params.put("customerId", customerId);
+            }
+            resultJSON = cargoService.query(page, rows, params);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+        } finally {
+            return resultJSON;
+        }
+    }
+
+    @RequestMapping(value = "/queryByPK")
+    public ResultJSON queryByPK(@RequestParam String id, HttpServletRequest request) {
+        try {
+            String userId = (String) request.getHeader("userId");
+            resultJSON = cargoService.queryByPK(id);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+        } finally {
+            return resultJSON;
+        }
+    }
+
+    @RequestMapping(value = "/save")
+    public ResultJSON save(@RequestParam String json, HttpServletRequest request) {
+        try {
+            String userId = (String) request.getHeader("userId");
+            resultJSON = cargoService.save(userId, json);
+        } catch (Exception ex) {
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+            ex.printStackTrace();
+        } finally {
+            return resultJSON;
+        }
+    }
+
+    @RequestMapping(value = "/transfer")
+    public ResultJSON transfer(@RequestParam String json, HttpServletRequest request) {
+        try {
+            String userId = (String) request.getHeader("userId");
+            resultJSON = cargoService.transfer(userId, json);
+        } catch (Exception ex) {
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+            ex.printStackTrace();
+        } finally {
+            return resultJSON;
+        }
+    }
+
+    @RequestMapping(value = "/remove")
+    public ResultJSON remove(@RequestParam String id, HttpServletRequest request) {
+        try {
+            String userId = (String) request.getHeader("userId");
+            resultJSON = cargoService.remove(userId, id);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+        } finally {
+            return resultJSON;
+        }
+    }
+
+    @RequestMapping(value = "/removeBatch")
+    public ResultJSON removeBatch(@RequestParam String ids, HttpServletRequest request) {
+        try {
+            String userId = (String) request.getHeader("userId");
+            resultJSON = cargoService.removeBatch(userId, ids);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+        } finally {
+            return resultJSON;
+        }
+    }
+}

sto/src/main/java/com/shinsoft/sto/mapper/main/CargoChangeRecordMapper.java

@@ -0,0 +1,16 @@
+package com.shinsoft.sto.mapper.main;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.shinsoft.sto.model.main.CargoChangeRecord;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+public interface CargoChangeRecordMapper extends BaseMapper<CargoChangeRecord> {
+
+    /**
+     * 分页查询货权变更记录
+     */
+    Page<CargoChangeRecord> selectCargoChangeRecordPage(Page<CargoChangeRecord> page, @Param("params") Map<String, Object> params);
+}

sto/src/main/java/com/shinsoft/sto/mapper/main/CargoChangeRecordMapper.xml

@@ -0,0 +1,86 @@
+<?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.shinsoft.sto.mapper.main.CargoChangeRecordMapper">
+
+    <resultMap id="BaseResultMap" type="com.shinsoft.sto.model.main.CargoChangeRecord">
+        <id column="id" property="id" jdbcType="VARCHAR"/>
+        <result column="process_instance_id" property="processInstanceId" jdbcType="VARCHAR"/>
+        <result column="process_instance_status" property="processInstanceStatus" jdbcType="VARCHAR"/>
+        <result column="add_id" property="addId" jdbcType="VARCHAR"/>
+        <result column="add_code" property="addCode" jdbcType="VARCHAR"/>
+        <result column="add_name" property="addName" jdbcType="VARCHAR"/>
+        <result column="add_dept_id" property="addDeptId" jdbcType="VARCHAR"/>
+        <result column="add_dept_code" property="addDeptCode" jdbcType="VARCHAR"/>
+        <result column="add_dept_name" property="addDeptName" jdbcType="VARCHAR"/>
+        <result column="add_time" property="addTime" jdbcType="TIMESTAMP"/>
+        <result column="modify_id" property="modifyId" jdbcType="VARCHAR"/>
+        <result column="modify_code" property="modifyCode" jdbcType="VARCHAR"/>
+        <result column="modify_name" property="modifyName" jdbcType="VARCHAR"/>
+        <result column="modify_time" property="modifyTime" jdbcType="TIMESTAMP"/>
+        <result column="cancel_id" property="cancelId" jdbcType="VARCHAR"/>
+        <result column="cancel_code" property="cancelCode" jdbcType="VARCHAR"/>
+        <result column="cancel_name" property="cancelName" jdbcType="VARCHAR"/>
+        <result column="cancel_time" property="cancelTime" jdbcType="TIMESTAMP"/>
+        <result column="cancel_flag" property="cancelFlag" jdbcType="VARCHAR"/>
+        <result column="belong_id" property="belongId" jdbcType="VARCHAR"/>
+        <result column="weight" property="weight" jdbcType="NUMERIC"/>
+        <result column="change_from" property="changeFrom" jdbcType="VARCHAR"/>
+        <result column="sub_str" property="subStr" jdbcType="VARCHAR"/>
+        <result column="uper_customer_id" property="uperCustomerId" jdbcType="VARCHAR"/>
+        <result column="customer_id" property="customerId" jdbcType="VARCHAR"/>
+        <result column="ord_no" property="ordNo" jdbcType="VARCHAR"/>
+        <result column="remark" property="remark" jdbcType="VARCHAR"/>
+
+        <!-- 关联上游客户信息 -->
+        <association property="uperCustomer" javaType="com.shinsoft.sto.model.main.Customer">
+            <id column="uper_customer_id" property="id"/>
+            <result column="uper_customer_nm" property="customerNm"/>
+            <result column="uper_customer_short_nm" property="customerShortNm"/>
+        </association>
+
+        <!-- 关联客户信息 -->
+        <association property="customer" javaType="com.shinsoft.sto.model.main.Customer">
+            <id column="customer_id" property="id"/>
+            <result column="customer_nm" property="customerNm"/>
+            <result column="customer_short_nm" property="customerShortNm"/>
+        </association>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        r.id, r.process_instance_id, r.process_instance_status, r.add_id, r.add_code, r.add_name,
+        r.add_dept_id, r.add_dept_code, r.add_dept_name, r.add_time, r.modify_id, r.modify_code, r.modify_name,
+        r.modify_time, r.cancel_id, r.cancel_code, r.cancel_name, r.cancel_time, r.cancel_flag,
+        r.belong_id, r.weight, r.change_from, r.sub_str, r.uper_customer_id, r.customer_id, r.ord_no, r.remark,
+        uper.customer_nm as uper_customer_nm, uper.customer_short_nm as uper_customer_short_nm,
+        cust.customer_nm as customer_nm, cust.customer_short_nm as customer_short_nm
+    </sql>
+
+    <select id="selectCargoChangeRecordPage" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from T_WARE_CARGOCHANGE_RECORD r
+        left join T_MAIN_CUSTOMER uper on r.uper_customer_id = uper.id and uper.cancel_flag = '0'
+        left join T_MAIN_CUSTOMER cust on r.customer_id = cust.id and cust.cancel_flag = '0'
+        where r.cancel_flag = '0'
+        <if test="params.uperCustomerId != null and params.uperCustomerId != ''">
+            and r.uper_customer_id = #{params.uperCustomerId}
+        </if>
+        <if test="params.customerId != null and params.customerId != ''">
+            and r.customer_id = #{params.customerId}
+        </if>
+        <if test="params.startDate != null and params.startDate != ''">
+            and r.modify_time >= to_date(#{params.startDate}, 'yyyy-MM-dd')
+        </if>
+        <if test="params.endDate != null and params.endDate != ''">
+            and r.modify_time &lt; to_date(#{params.endDate}, 'yyyy-MM-dd') + 1
+        </if>
+        <if test="params.subStr != null and params.subStr != ''">
+            and r.sub_str = #{params.subStr}
+        </if>
+        <if test="params.changeFrom != null and params.changeFrom != ''">
+            and r.change_from = #{params.changeFrom}
+        </if>
+        order by r.modify_time desc
+    </select>
+
+</mapper>

sto/src/main/java/com/shinsoft/sto/mapper/main/CargoMapper.java

@@ -0,0 +1,24 @@
+package com.shinsoft.sto.mapper.main;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.shinsoft.sto.model.main.Cargo;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
+
+public interface CargoMapper extends BaseMapper<Cargo> {
+
+    /**
+     * 分页查询货权信息
+     */
+    Page<Cargo> selectCargoPage(Page<Cargo> page, @Param("params") Map<String, Object> params);
+
+    /**
+     * 根据上游客户ID和客户ID查询货权信息
+     */
+    @Select("SELECT * FROM T_MAIN_CARGO WHERE cancel_flag = '0' AND uper_customer_id = #{uperCustomerId} AND customer_id = #{customerId}")
+    List<Cargo> selectByCustomerIds(@Param("uperCustomerId") String uperCustomerId, @Param("customerId") String customerId);
+}

sto/src/main/java/com/shinsoft/sto/mapper/main/CargoMapper.xml

@@ -0,0 +1,71 @@
+<?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.shinsoft.sto.mapper.main.CargoMapper">
+
+    <resultMap id="BaseResultMap" type="com.shinsoft.sto.model.main.Cargo">
+        <id column="id" property="id" jdbcType="VARCHAR"/>
+        <result column="process_instance_id" property="processInstanceId" jdbcType="VARCHAR"/>
+        <result column="process_instance_status" property="processInstanceStatus" jdbcType="VARCHAR"/>
+        <result column="add_id" property="addId" jdbcType="VARCHAR"/>
+        <result column="add_code" property="addCode" jdbcType="VARCHAR"/>
+        <result column="add_name" property="addName" jdbcType="VARCHAR"/>
+        <result column="add_dept_id" property="addDeptId" jdbcType="VARCHAR"/>
+        <result column="add_dept_code" property="addDeptCode" jdbcType="VARCHAR"/>
+        <result column="add_dept_name" property="addDeptName" jdbcType="VARCHAR"/>
+        <result column="add_time" property="addTime" jdbcType="TIMESTAMP"/>
+        <result column="modify_id" property="modifyId" jdbcType="VARCHAR"/>
+        <result column="modify_code" property="modifyCode" jdbcType="VARCHAR"/>
+        <result column="modify_name" property="modifyName" jdbcType="VARCHAR"/>
+        <result column="modify_time" property="modifyTime" jdbcType="TIMESTAMP"/>
+        <result column="cancel_id" property="cancelId" jdbcType="VARCHAR"/>
+        <result column="cancel_code" property="cancelCode" jdbcType="VARCHAR"/>
+        <result column="cancel_name" property="cancelName" jdbcType="VARCHAR"/>
+        <result column="cancel_time" property="cancelTime" jdbcType="TIMESTAMP"/>
+        <result column="cancel_flag" property="cancelFlag" jdbcType="VARCHAR"/>
+        <result column="belong_id" property="belongId" jdbcType="VARCHAR"/>
+        <result column="uper_customer_id" property="uperCustomerId" jdbcType="VARCHAR"/>
+        <result column="customer_id" property="customerId" jdbcType="VARCHAR"/>
+        <result column="sum_weight" property="sumWeight" jdbcType="NUMERIC"/>
+        <result column="use_weight" property="useWeight" jdbcType="NUMERIC"/>
+
+        <!-- 关联上游客户信息 -->
+        <association property="uperCustomer" javaType="com.shinsoft.sto.model.main.Customer">
+            <id column="uper_customer_id" property="id"/>
+            <result column="uper_customer_nm" property="customerNm"/>
+            <result column="uper_customer_short_nm" property="customerShortNm"/>
+        </association>
+
+        <!-- 关联客户信息 -->
+        <association property="customer" javaType="com.shinsoft.sto.model.main.Customer">
+            <id column="customer_id" property="id"/>
+            <result column="customer_nm" property="customerNm"/>
+            <result column="customer_short_nm" property="customerShortNm"/>
+        </association>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        c.id, c.process_instance_id, c.process_instance_status, c.add_id, c.add_code, c.add_name,
+        c.add_dept_id, c.add_dept_code, c.add_dept_name, c.add_time, c.modify_id, c.modify_code, c.modify_name,
+        c.modify_time, c.cancel_id, c.cancel_code, c.cancel_name, c.cancel_time, c.cancel_flag,
+        c.belong_id, c.uper_customer_id, c.customer_id, c.sum_weight, c.use_weight,
+        uper.customer_nm as uper_customer_nm, uper.customer_short_nm as uper_customer_short_nm,
+        cust.customer_nm as customer_nm, cust.customer_short_nm as customer_short_nm
+    </sql>
+
+    <select id="selectCargoPage" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from T_MAIN_CARGO c
+        left join T_MAIN_CUSTOMER uper on c.uper_customer_id = uper.id and uper.cancel_flag = '0'
+        left join T_MAIN_CUSTOMER cust on c.customer_id = cust.id and cust.cancel_flag = '0'
+        where c.cancel_flag = '0'
+        <if test="params.uperCustomerId != null and params.uperCustomerId != ''">
+            and c.uper_customer_id = #{params.uperCustomerId}
+        </if>
+        <if test="params.customerId != null and params.customerId != ''">
+            and c.customer_id = #{params.customerId}
+        </if>
+        order by c.add_time desc
+    </select>
+
+</mapper>

sto/src/main/java/com/shinsoft/sto/model/main/Cargo.java

@@ -0,0 +1,51 @@
+package com.shinsoft.sto.model.main;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.shinsoft.generator.model.BaseModel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("T_MAIN_CARGO")
+@ApiModel(value = "货权管理", description = "货权管理信息表")
+public class Cargo extends BaseModel {
+
+    @ApiModelProperty("上游客户ID")
+    private String uperCustomerId;
+
+    @ApiModelProperty("客户ID")
+    private String customerId;
+
+    @ApiModelProperty("可进行货权转移的重量")
+    private BigDecimal sumWeight = BigDecimal.ZERO;
+
+    @ApiModelProperty("使用重量")
+    private BigDecimal useWeight = BigDecimal.ZERO;
+
+    // 关联上游客户信息
+    @TableField(exist = false)
+    @ApiModelProperty("上游客户信息")
+    private Customer uperCustomer;
+
+    // 关联客户信息
+    @TableField(exist = false)
+    @ApiModelProperty("客户信息")
+    private Customer customer;
+
+    // 为了方便前端显示，添加客户名称字段
+    @TableField(exist = false)
+    @ApiModelProperty("上游客户名称")
+    private String uperCustomerName;
+
+    @TableField(exist = false)
+    @ApiModelProperty("客户名称")
+    private String customerName;
+}

sto/src/main/java/com/shinsoft/sto/model/main/CargoChangeRecord.java

@@ -0,0 +1,51 @@
+package com.shinsoft.sto.model.main;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.shinsoft.generator.model.BaseModel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("T_WARE_CARGOCHANGE_RECORD")
+@ApiModel(value = "货权变更记录", description = "货权重量变更履历表")
+public class CargoChangeRecord extends BaseModel {
+
+    @ApiModelProperty("重量")
+    private BigDecimal weight = BigDecimal.ZERO;
+
+    @ApiModelProperty("修改信息来源")
+    private String changeFrom;
+
+    @ApiModelProperty("增减情况")
+    private String subStr;
+
+    @ApiModelProperty("上游客户ID")
+    private String uperCustomerId;
+
+    @ApiModelProperty("下游客户ID")
+    private String customerId;
+
+    @ApiModelProperty("订单号")
+    private String ordNo;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    // 关联上游客户信息
+    @TableField(exist = false)
+    @ApiModelProperty("上游客户信息")
+    private Customer uperCustomer;
+
+    // 关联客户信息
+    @TableField(exist = false)
+    @ApiModelProperty("客户信息")
+    private Customer customer;
+}

sto/src/main/java/com/shinsoft/sto/service/impl/main/CargoChangeRecordServiceImp.java

@@ -0,0 +1,116 @@
+package com.shinsoft.sto.service.impl.main;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.shinsoft.sto.mapper.main.CargoChangeRecordMapper;
+import com.shinsoft.sto.model.main.CargoChangeRecord;
+import com.shinsoft.sto.service.main.CargoChangeRecordService;
+import com.shinsoft.tools.JSONTools;
+import com.shinsoft.tools.model.common.ResponseCodeMsg;
+import com.shinsoft.tools.model.common.ResultJSON;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class CargoChangeRecordServiceImp extends ServiceImpl<CargoChangeRecordMapper, CargoChangeRecord> implements CargoChangeRecordService {
+
+    ResultJSON resultJSON;
+
+    @Autowired
+    CargoChangeRecordMapper cargoChangeRecordMapper;
+
+    @Override
+    public ResultJSON query(Integer page, Integer rows, Map<String, Object> params) {
+        try {
+            Page<CargoChangeRecord> recordPage = new Page<>(page, rows);
+            Page<CargoChangeRecord> list = cargoChangeRecordMapper.selectCargoChangeRecordPage(recordPage, params);
+            resultJSON = JSONTools.toResultJSON(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+        }
+        return resultJSON;
+    }
+
+    @Override
+    public ResultJSON queryByPK(String id) {
+        try {
+            CargoChangeRecord record = cargoChangeRecordMapper.selectById(id);
+            resultJSON = JSONTools.toResultJSON(record);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+        }
+        return resultJSON;
+    }
+
+    @Override
+    public ResultJSON save(String userId, String json) {
+        try {
+            Date date = new Date();
+            CargoChangeRecord record = JSON.parseObject(json, new TypeReference<CargoChangeRecord>() {});
+
+            if (StringUtils.isEmpty(record.getId())) {
+                record.setCancelFlag("0");
+                record.setAddId(userId);
+                record.setAddTime(date);
+                cargoChangeRecordMapper.insert(record);
+            } else {
+                record.setModifyId(userId);
+                record.setModifyTime(date);
+                cargoChangeRecordMapper.updateById(record);
+            }
+
+            resultJSON = JSONTools.toResultJSON(record);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+        }
+        return resultJSON;
+    }
+
+    @Override
+    public ResultJSON remove(String userId, String id) {
+        try {
+            Date date = new Date();
+            CargoChangeRecord record = cargoChangeRecordMapper.selectById(id);
+            record.setCancelFlag("1");
+            record.setModifyId(userId);
+            record.setModifyTime(date);
+            cargoChangeRecordMapper.updateById(record);
+            resultJSON = JSONTools.toResultJSON("");
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+        }
+        return resultJSON;
+    }
+
+    @Override
+    public ResultJSON removeBatch(String userId, String ids) {
+        try {
+            Date date = new Date();
+            List<String> list = JSON.parseObject(ids, new TypeReference<List<String>>() {});
+            CargoChangeRecord record;
+            for (String id : list) {
+                record = cargoChangeRecordMapper.selectById(id);
+                record.setCancelFlag("1");
+                record.setModifyId(userId);
+                record.setModifyTime(date);
+                cargoChangeRecordMapper.updateById(record);
+            }
+            resultJSON = JSONTools.toResultJSON("");
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+        }
+        return resultJSON;
+    }
+}

sto/src/main/java/com/shinsoft/sto/service/impl/main/CargoServiceImp.java

@@ -0,0 +1,271 @@
+package com.shinsoft.sto.service.impl.main;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.shinsoft.sto.mapper.main.CargoMapper;
+import com.shinsoft.sto.mapper.main.CargoChangeRecordMapper;
+import com.shinsoft.sto.model.main.Cargo;
+import com.shinsoft.sto.model.main.CargoChangeRecord;
+import com.shinsoft.sto.service.main.CargoService;
+import com.shinsoft.tools.JSONTools;
+import com.shinsoft.tools.model.common.ResponseCodeMsg;
+import com.shinsoft.tools.model.common.ResultJSON;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+@Service
+public class CargoServiceImp extends ServiceImpl<CargoMapper, Cargo> implements CargoService {
+
+    ResultJSON resultJSON;
+
+    @Autowired
+    CargoMapper cargoMapper;
+    @Autowired
+    CargoChangeRecordMapper cargoChangeRecordMapper;
+
+    @Override
+    public ResultJSON query(Integer page, Integer rows, Map<String, Object> params) {
+        try {
+            Page<Cargo> cargoPage = new Page<>(page, rows);
+            Page<Cargo> list = cargoMapper.selectCargoPage(cargoPage, params);
+
+            // 设置客户名称，方便前端显示
+            if (list.getRecords() != null) {
+                for (Cargo cargo : list.getRecords()) {
+                    if (cargo.getUperCustomer() != null) {
+                        cargo.setUperCustomerName(cargo.getUperCustomer().getCustomerNm());
+                    }
+                    if (cargo.getCustomer() != null) {
+                        cargo.setCustomerName(cargo.getCustomer().getCustomerNm());
+                    }
+                }
+            }
+
+            resultJSON = JSONTools.toResultJSON(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+        }
+        return resultJSON;
+    }
+    @Override
+    public ResultJSON queryByPK(String id) {
+        try {
+            Cargo cargo = cargoMapper.selectById(id);
+            resultJSON = JSONTools.toResultJSON(cargo);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+        }
+        return resultJSON;
+    }
+    @Override
+    public ResultJSON save(String userId, String json) {
+        try {
+            Date date = new Date();
+            Cargo cargo = JSON.parseObject(json, new TypeReference<Cargo>() {});
+
+            if (StringUtils.isEmpty(cargo.getId())) {
+                cargo.setCancelFlag("0");
+                cargo.setAddId(userId);
+                cargo.setAddTime(date);
+                cargoMapper.insert(cargo);
+            } else {
+                cargo.setModifyId(userId);
+                cargo.setModifyTime(date);
+                cargoMapper.updateById(cargo);
+            }
+
+            resultJSON = JSONTools.toResultJSON(cargo);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+        }
+        return resultJSON;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResultJSON transfer(String userId, String json) {
+        try {
+            Date date = new Date();
+            // 解析前端传递的数据
+            Map<String, Object> formData = JSON.parseObject(json, new TypeReference<Map<String, Object>>() {});
+
+            String uperCustomerId = (String) formData.get("uperCustomerId");
+            String customerId = (String) formData.get("customerId");
+            String subStr = (String) formData.get("subStr"); // 增加/减少
+            BigDecimal weight = new BigDecimal(formData.get("weight").toString());
+            String ordNo = (String) formData.get("ordNo");
+            String remark = (String) formData.get("remark");
+
+            // 根据上游客户ID和客户ID查询是否已存在货权记录
+            QueryWrapper<Cargo> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("uper_customer_id", uperCustomerId)
+                    .eq("customer_id", customerId)
+                    .eq("cancel_flag", "0");
+            Cargo existingCargo = cargoMapper.selectOne(queryWrapper);
+
+            Cargo cargo;
+            if (existingCargo == null) {
+                // 新增记录
+                cargo = new Cargo();
+                cargo.setId(UUID.randomUUID().toString().replace("-", ""));
+                cargo.setUperCustomerId(uperCustomerId);
+                cargo.setCustomerId(customerId);
+
+                if ("增加".equals(subStr)) {
+                    // 新增+增加：可使用量=0+重量，已使用量=0
+                    cargo.setSumWeight(weight);
+                    cargo.setUseWeight(BigDecimal.ZERO);
+                } else if ("减少".equals(subStr)) {
+                    // 新增+减少：不允许，因为不能从0减少
+                    resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, "无法对不存在的记录进行减少操作");
+                    return resultJSON;
+                } else {
+                    // 默认新增：可使用量=0+重量，已使用量=0
+                    cargo.setSumWeight(weight);
+                    cargo.setUseWeight(BigDecimal.ZERO);
+                }
+
+                cargo.setCancelFlag("0");
+                cargo.setAddId(userId);
+                cargo.setAddTime(date);
+                cargoMapper.insert(cargo);
+            } else {
+                // 更新现有记录
+                cargo = existingCargo;
+                BigDecimal oldSumWeight = cargo.getSumWeight() != null ? cargo.getSumWeight() : BigDecimal.ZERO;
+                BigDecimal oldUseWeight = cargo.getUseWeight() != null ? cargo.getUseWeight() : BigDecimal.ZERO;
+
+                if ("增加".equals(subStr)) {
+                    // 增加：可使用量=原可使用量+重量，已使用量不变
+                    cargo.setSumWeight(oldSumWeight.add(weight));
+                } else if ("减少".equals(subStr)) {
+                    // 减少：可使用量=原可使用量-重量，已使用量=0+重量
+                    if (oldSumWeight.compareTo(weight) < 0) {
+                        resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, "减少的重量不能大于当前可使用量");
+                        return resultJSON;
+                    }
+                    cargo.setSumWeight(oldSumWeight.subtract(weight));
+                    cargo.setUseWeight(oldUseWeight.add(weight));
+                }
+
+                cargo.setModifyId(userId);
+                cargo.setModifyTime(date);
+                cargoMapper.updateById(cargo);
+            }
+
+            // 记录货权变更履历
+            CargoChangeRecord changeRecord = new CargoChangeRecord();
+            changeRecord.setId(UUID.randomUUID().toString().replace("-", ""));
+            changeRecord.setWeight(weight);
+            changeRecord.setChangeFrom("手动调整");
+            changeRecord.setSubStr(subStr);
+            changeRecord.setUperCustomerId(uperCustomerId);
+            changeRecord.setCustomerId(customerId);
+            changeRecord.setOrdNo(ordNo);
+            changeRecord.setRemark(remark);
+            changeRecord.setCancelFlag("0");
+            changeRecord.setAddId(userId);
+            changeRecord.setAddTime(date);
+            changeRecord.setModifyId(userId);
+            changeRecord.setModifyTime(date);
+            cargoChangeRecordMapper.insert(changeRecord);
+
+            resultJSON = JSONTools.toResultJSON(cargo);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+        }
+        return resultJSON;
+    }
+   /* @Override
+    public ResultJSON save(String userId, String json) {
+        try {
+            Date date = new Date();
+            Cargo cargo = JSON.parseObject(json, new TypeReference<Cargo>() {});
+
+            if (StringUtils.isEmpty(cargo.getId())) {
+                cargo.setCancelFlag("0");
+                cargo.setAddId(userId);
+                cargo.setAddTime(date);
+                cargoMapper.insert(cargo);
+            } else {
+                cargo.setModifyId(userId);
+                cargo.setModifyTime(date);
+                cargoMapper.updateById(cargo);
+            }
+
+            resultJSON = JSONTools.toResultJSON(cargo);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+        }
+        return resultJSON;
+    }
+
+    @Override
+    public ResultJSON transfer(String userId, String json) {
+        try {
+            Date date = new Date();
+            Cargo cargo = JSON.parseObject(json, new TypeReference<Cargo>() {});
+            // 这里实现货权转移逻辑，包括记录变更履历
+            // 具体实现根据业务需求来写
+            resultJSON = JSONTools.toResultJSON(cargo);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+        }
+        return resultJSON;
+    }*/
+
+    @Override
+    public ResultJSON remove(String userId, String id) {
+        try {
+            Date date = new Date();
+            Cargo cargo = cargoMapper.selectById(id);
+            cargo.setCancelFlag("1");
+            cargo.setModifyId(userId);
+            cargo.setModifyTime(date);
+            cargoMapper.updateById(cargo);
+            resultJSON = JSONTools.toResultJSON("");
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+        }
+        return resultJSON;
+    }
+
+    @Override
+    public ResultJSON removeBatch(String userId, String ids) {
+        try {
+            Date date = new Date();
+            List<String> list = JSON.parseObject(ids, new TypeReference<List<String>>() {});
+            Cargo cargo;
+            for (String id : list) {
+                cargo = cargoMapper.selectById(id);
+                cargo.setCancelFlag("1");
+                cargo.setModifyId(userId);
+                cargo.setModifyTime(date);
+                cargoMapper.updateById(cargo);
+            }
+            resultJSON = JSONTools.toResultJSON("");
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+        }
+        return resultJSON;
+    }
+}

sto/src/main/java/com/shinsoft/sto/service/main/CargoChangeRecordService.java

@@ -0,0 +1,20 @@
+package com.shinsoft.sto.service.main;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.shinsoft.sto.model.main.CargoChangeRecord;
+import com.shinsoft.tools.model.common.ResultJSON;
+
+import java.util.Map;
+
+public interface CargoChangeRecordService extends IService<CargoChangeRecord> {
+
+    ResultJSON query(Integer page, Integer rows, Map<String, Object> params);
+
+    ResultJSON queryByPK(String id);
+
+    ResultJSON save(String userId, String json);
+
+    ResultJSON remove(String userId, String id);
+
+    ResultJSON removeBatch(String userId, String ids);
+}

sto/src/main/java/com/shinsoft/sto/service/main/CargoService.java

@@ -0,0 +1,22 @@
+package com.shinsoft.sto.service.main;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.shinsoft.sto.model.main.Cargo;
+import com.shinsoft.tools.model.common.ResultJSON;
+
+import java.util.Map;
+
+public interface CargoService extends IService<Cargo> {
+
+    ResultJSON query(Integer page, Integer rows, Map<String, Object> params);
+
+    ResultJSON queryByPK(String id);
+
+    ResultJSON save(String userId, String json);
+
+    ResultJSON transfer(String userId, String json);
+
+    ResultJSON remove(String userId, String id);
+
+    ResultJSON removeBatch(String userId, String ids);
+}