1

src/main/java/com/chinaitop/depot/business/controller/BusinessDeliveryStorageNoticeController.java

@@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -822,4 +823,28 @@ public class BusinessDeliveryStorageNoticeController {
         }
         return modelMap;
     }
+
+    @RequestMapping(value="/updateYjssl",produces = MediaType.APPLICATION_JSON_VALUE,  method=RequestMethod.GET)
+	@ApiOperation(value="修改通知单已结算数量", notes = "根据id查找")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "tzdid", value = "通知单ID", dataType="int", paramType = "form"),
+		@ApiImplicitParam(name = "bcjssl", value = "本次结算数量(吨)", dataType="String", paramType = "form")
+	})
+    public void updateYjssl(Integer tzdid, String bcjssl) {
+        if (tzdid != null) {
+        	// 获取当前通知单主数据
+        	BusinessDeliveryStorageNotice deliveryStorageNotice = deliveryStorageNoticeService.findById(tzdid);
+        	if (null != deliveryStorageNotice) {
+        		if (StringUtils.isNotBlank(deliveryStorageNotice.getYjssl())) {
+        			BigDecimal y_yjssl = new BigDecimal(deliveryStorageNotice.getYjssl());
+        			BigDecimal new_yjssl = y_yjssl.add(new BigDecimal(bcjssl));
+        			deliveryStorageNotice.setYjssl(new_yjssl.toString());
+        		} else {
+        			deliveryStorageNotice.setYjssl(bcjssl);
+        		}
+        		deliveryStorageNoticeService.update(deliveryStorageNotice, null);
+        	}
+            
+        }
+    }
 }

src/main/java/com/chinaitop/depot/business/mapper/BusinessDeliveryStorageNoticeMapper.xml

@@ -57,6 +57,7 @@
     <result column="change_content" property="changeContent" jdbcType="VARCHAR" />
     <result column="lqss" property="lqss" jdbcType="VARCHAR" />
     <result column="is_merge" property="isMerge" jdbcType="VARCHAR" />
+    <result column="yjssl" property="yjssl" jdbcType="VARCHAR" />
     
   </resultMap>
   <sql id="Example_Where_Clause" >
@@ -126,7 +127,7 @@
     warehouse_id, warehouse_name, creater, create_time, create_unit, create_depot, update_time, 
     org_id, in_application, creater_id, root_contract_bid, identification, carNumber, 
     changing, change_record_flag, root_notice_bid, original_notice, original_notice_bid, 
-    change_reason, change_time, change_content, lqss, is_merge
+    change_reason, change_time, change_content, lqss, is_merge, yjssl
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.BusinessDeliveryStorageNoticeExample" >
     select
@@ -176,7 +177,7 @@
       root_contract_bid, identification, carNumber, 
        changing, change_record_flag, 
       root_notice_bid, original_notice, original_notice_bid, 
-      change_reason, change_time, change_content, lqss
+      change_reason, change_time, change_content, lqss, yjssl
       )
     values (#{id,jdbcType=INTEGER}, #{billType,jdbcType=VARCHAR}, #{billTypeId,jdbcType=INTEGER}, 
       #{billNumber,jdbcType=VARCHAR}, #{shipingCount,jdbcType=VARCHAR}, #{finishedCount,jdbcType=VARCHAR}, 
@@ -195,7 +196,8 @@
       #{rootContractBid,jdbcType=INTEGER}, #{identification,jdbcType=VARCHAR}, #{carnumber,jdbcType=VARCHAR}, 
        #{changing,jdbcType=VARCHAR}, #{changeRecordFlag,jdbcType=VARCHAR}, 
       #{rootNoticeBid,jdbcType=INTEGER}, #{originalNotice,jdbcType=VARCHAR}, #{originalNoticeBid,jdbcType=INTEGER}, 
-      #{changeReason,jdbcType=VARCHAR}, #{changeTime,jdbcType=TIMESTAMP}, #{changeContent,jdbcType=VARCHAR}, #{lqss,jdbcType=VARCHAR}
+      #{changeReason,jdbcType=VARCHAR}, #{changeTime,jdbcType=TIMESTAMP}, #{changeContent,jdbcType=VARCHAR}, #{lqss,jdbcType=VARCHAR},
+      #{yjssl,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessDeliveryStorageNotice" >
@@ -366,6 +368,9 @@
       <if test="isMerge != null">
         is_merge,
       </if>
+      <if test="yjssl != null">
+        yjssl,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -533,6 +538,9 @@
       <if test="isMerge != null">
         #{isMerge,jdbcType=VARCHAR},
       </if>
+      <if test="yjssl != null">
+        #{yjssl,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.business.model.BusinessDeliveryStorageNoticeExample" resultType="java.lang.Integer" >
@@ -709,6 +717,9 @@
       <if test="record.isMerge != null">
         is_merge = #{record.isMerge,jdbcType=VARCHAR},
       </if>
+      <if test="record.yjssl != null">
+        yjssl = #{record.yjssl,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -770,7 +781,8 @@
       change_time = #{record.changeTime,jdbcType=TIMESTAMP},
       change_content = #{record.changeContent,jdbcType=VARCHAR},
       lqss = #{record.lqss,jdbcType=VARCHAR},
-      is_merge = #{record.isMerge,jdbcType=VARCHAR}
+      is_merge = #{record.isMerge,jdbcType=VARCHAR},
+      yjssl = #{record.yjssl,jdbcType=VARCHAR}
      
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -941,6 +953,9 @@
       <if test="isMerge != null">
         is_merge = #{isMerge,jdbcType=VARCHAR},
       </if>
+      <if test="yjssl != null">
+        yjssl = #{yjssl,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -999,8 +1014,8 @@
       change_time = #{changeTime,jdbcType=TIMESTAMP},
       change_content = #{changeContent,jdbcType=VARCHAR},
       lqss = #{lqss,jdbcType=VARCHAR},
-      is_merge = #{isMerge,jdbcType=VARCHAR}
-      
+      is_merge = #{isMerge,jdbcType=VARCHAR},
+      yjssl = #{yjssl,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   

src/main/java/com/chinaitop/depot/business/model/BusinessDeliveryStorageNotice.java

@@ -20,6 +20,9 @@ public class BusinessDeliveryStorageNotice {
     
     //业务字段(是否合并过)
     private String isMerge;
+
+    //本次结算数量
+    private String yjssl;
     
     /**
      * 是否有过合并(0:有过,1:没有)
@@ -1764,4 +1767,20 @@ public class BusinessDeliveryStorageNotice {
         this.lqss = lqss == null ? null : lqss.trim();
     }
 
+    /**
+     * 已结算数量
+     * @return
+     */
+	public String getYjssl() {
+		return yjssl;
+	}
+
+	/**
+	 * 已结算数量
+	 * @param yjssl
+	 */
+	public void setYjssl(String yjssl) {
+		this.yjssl = yjssl == null ? null : yjssl.trim();
+	}
+
 }