Browse Source

财务数据添加序号字段

turujie 2 years ago
parent
commit
60cedaffa2

+ 2 - 0
business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ComCustomerServiceImpl.java

@@ -112,6 +112,7 @@ public class ComCustomerServiceImpl extends ServiceImpl<ComCustomerDao, ComCusto
             comMetalFinanceItemDo.setVolumeno(comProductVo.getVOLUMENO());
             comMetalFinanceItemDo.setMetalconfigid(comMetalConfigDo.getId());
             comMetalFinanceItemDo.setCustomerid(comProductVo.getCustomerId());
+            comMetalFinanceItemDo.setSerialno(comProductVo.getSERIALNO());
             comMetalFinanceItemDos.add(comMetalFinanceItemDo);
 
             // 财务复核
@@ -134,6 +135,7 @@ public class ComCustomerServiceImpl extends ServiceImpl<ComCustomerDao, ComCusto
             comMetalFinanceRecheckItemDo.setVolumeno(comProductVo.getVOLUMENO());
             comMetalFinanceRecheckItemDo.setMetalconfigid(comMetalConfigDo.getId());
             comMetalFinanceRecheckItemDo.setCustomerid(comProductVo.getCustomerId());
+            comMetalFinanceRecheckItemDo.setSerialno(comProductVo.getSERIALNO());
             comMetalFinanceRecheckItemDos.add(comMetalFinanceRecheckItemDo);
         }
         // 直接插入数据表 com_metal_finance_item

+ 7 - 0
business-entity/src/main/java/com/bsentity/domin/ComMetalFinanceItemDo.java

@@ -253,4 +253,11 @@ public class ComMetalFinanceItemDo implements Serializable {
      */
     @TableField("PRODUCTID")
     private String productid;
+
+
+    /**
+     * 序号
+     */
+    @TableField("SERIALNO")
+    private Integer serialno;
 }

+ 7 - 0
business-entity/src/main/java/com/bsentity/domin/ComMetalFinanceRecheckItemDo.java

@@ -259,4 +259,11 @@ public class ComMetalFinanceRecheckItemDo implements Serializable {
      */
     @TableField("ORIORDERNO")
     private String oriorderno;
+
+
+    /**
+     * 序号
+     */
+    @TableField("SERIALNO")
+    private Integer serialno;
 }

+ 6 - 0
business-entity/src/main/java/com/bsentity/vo/ComProductVo.java

@@ -103,4 +103,10 @@ public class ComProductVo implements Serializable {
     @JsonProperty("WIDE")
     private BigDecimal WIDE;
 
+    /**
+     * 序号
+     */
+    @JsonProperty("SERIALNO")
+    private Integer SERIALNO;
+
 }

+ 1 - 0
business-entity/src/main/resources/mybatis/ComMetalFinanceItemDao.xml

@@ -42,6 +42,7 @@
         <result column="DELIVERYNO" property="deliveryno" />
         <result column="ORIORDERNO" property="oriorderno" />
         <result column="PRODUCTID" property="productid" />
+        <result column="SERIALNO" property="serialno"/>
     </resultMap>
 
 </mapper>

+ 48 - 0
business-entity/src/main/resources/mybatis/ComMetalFinanceRecheckItemDao.xml

@@ -0,0 +1,48 @@
+<?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.rongwei.bscommon.sys.dao.ComMetalFinanceRecheckItemDao">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.bsentity.domin.ComMetalFinanceRecheckItemDo">
+        <id column="ID" property="id" />
+        <result column="TENANTID" property="tenantid" />
+        <result column="ROPTION" property="roption" />
+        <result column="DELETED" property="deleted" />
+        <result column="REMARK" property="remark" />
+        <result column="CREATEDATE" property="createdate" />
+        <result column="CREATEUSERID" property="createuserid" />
+        <result column="MODIFYDATE" property="modifydate" />
+        <result column="MODIFYUSERID" property="modifyuserid" />
+        <result column="CREATEUSERNAME" property="createusername" />
+        <result column="MODIFYUSERNAME" property="modifyusername" />
+        <result column="ESTIMATEDLOSSDATE" property="estimatedlossdate" />
+        <result column="PROCESSUNITPRICE" property="processunitprice" />
+        <result column="COSTUNITPRICE" property="costunitprice" />
+        <result column="METALPRICELOSS" property="metalpriceloss" />
+        <result column="FREIGHTUNITPRICE" property="freightunitprice" />
+        <result column="FREIGHTLOSS" property="freightloss" />
+        <result column="TOTALCOSTRMB" property="totalcostrmb" />
+        <result column="EXCHANGERATE" property="exchangerate" />
+        <result column="PRICETOTALUSD" property="pricetotalusd" />
+        <result column="OTHERCOSTRMB" property="othercostrmb" />
+        <result column="OTHERCOSTUSD" property="othercostusd" />
+        <result column="UNITKGPRICELOSSUSD" property="unitkgpricelossusd" />
+        <result column="METALCONFIGID" property="metalconfigid" />
+        <result column="CUSTOMERID" property="customerid" />
+        <result column="ALLOY" property="alloy" />
+        <result column="ISSTATUS" property="isstatus" />
+        <result column="THICK" property="thick" />
+        <result column="WIDE" property="wide" />
+        <result column="LONGS" property="longs" />
+        <result column="VOLUMENO" property="volumeno" />
+        <result column="COMWEIGHT" property="comweight" />
+        <result column="MRAWEIGHT" property="mraweight" />
+        <result column="TYPE" property="type" />
+        <result column="FINALWEIGHT" property="finalweight" />
+        <result column="DELIVERYNO" property="deliveryno" />
+        <result column="ORIORDERNO" property="oriorderno" />
+        <result column="PRODUCTID" property="productid" />
+        <result column="SERIALNO" property="serialno"/>
+    </resultMap>
+
+</mapper>

+ 4 - 2
business-server/src/main/java/com/rongwei/controller/ComCustomerController.java

@@ -2,14 +2,16 @@ package com.rongwei.controller;
 
 import com.bsentity.vo.ComProductVo;
 import com.bsentity.vo.CopyFinanceRequest;
-import com.bsentity.vo.CopyFinanceVo;
 import com.rongwei.bscommon.sys.service.ComCustomerService;
 import com.rongwei.bscommon.sys.service.ComMetalFinanceItemService;
 import com.rongwei.rwcommon.base.R;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;