1

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

@@ -43,6 +43,7 @@
     <result column="is_sheet" property="isSheet" jdbcType="INTEGER" />
     <result column="cblx" property="cblx" jdbcType="VARCHAR" />
     <result column="ysid" property="ysid" jdbcType="VARCHAR" />
+    <result column="ytzdid" property="ytzdid" jdbcType="VARCHAR" />
      
   </resultMap>
   <sql id="Example_Where_Clause" >
@@ -117,7 +118,7 @@
     id, notice_number, crktype, contract_number, ywtype, house_id, ware_house_id, grain_kind, 
     grain_grade, count, outgoing_period, forwarding_unit, receive_unit, resion, in_application, 
     org_id, grain_attribute, grain_detail_kind, receive_time,input_time,grain_annual,productive_year,grain_producing_area,
-    lsxzzbdh,lssl,hzqlsxzdm,hzrq,ccshr,zjshr,tjshr,kjshr,ldshr,bz,audit_state,is_notice,pzmc,is_sheet,htbh,cblx,ysid
+    lsxzzbdh,lssl,hzqlsxzdm,hzrq,ccshr,zjshr,tjshr,kjshr,ldshr,bz,audit_state,is_notice,pzmc,is_sheet,htbh,cblx,ysid, ytzdid
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.BusinessNoticeReceiveExample" >
     select
@@ -157,7 +158,8 @@
       receive_unit, resion, in_application, 
       org_id, grain_attribute, grain_detail_kind, 
       receive_time,input_time,grain_annual,productive_year,grain_producing_area,
-      lsxzzbdh,lssl,hzqlsxzdm,hzrq,ccshr,zjshr,tjshr,kjshr,ldshr,bz,audit_state,is_notice,pzmc,is_sheet,htbh,cblx,ysid)
+      lsxzzbdh,lssl,hzqlsxzdm,hzrq,ccshr,zjshr,tjshr,kjshr,ldshr,bz,audit_state,is_notice,pzmc,is_sheet,htbh,cblx,ysid,
+      ytzdid)
     values (#{id,jdbcType=INTEGER}, #{noticeNumber,jdbcType=VARCHAR}, #{crktype,jdbcType=VARCHAR}, 
       #{contractNumber,jdbcType=VARCHAR}, #{ywtype,jdbcType=VARCHAR}, #{houseId,jdbcType=INTEGER}, 
       #{wareHouseId,jdbcType=INTEGER}, #{grainKind,jdbcType=INTEGER}, #{grainGrade,jdbcType=INTEGER}, 
@@ -169,8 +171,9 @@
       #{lsxzzbdh,jdbcType=VARCHAR},#{lssl,jdbcType=VARCHAR},#{hzqlsxzdm,jdbcType=INTEGER},
       #{hzrq,jdbcType=TIMESTAMP},#{ccshr,jdbcType=VARCHAR},#{zjshr,jdbcType=VARCHAR},
       #{tjshr,jdbcType=VARCHAR},#{kjshr,jdbcType=VARCHAR},#{ldshr,jdbcType=VARCHAR},
-      #{bz,jdbcType=VARCHAR},#{auditState,jdbcType=INTEGER},#{isNotice,jdbcType=INTEGER},#{pzmc,jdbcType=VARCHAR}
-      ,#{isSheet,jdbcType=INTEGER},#{htbh,jdbcType=VARCHAR},#{cblx,jdbcType=VARCHAR},#{ysid,jdbcType=VARCHAR})
+      #{bz,jdbcType=VARCHAR},#{auditState,jdbcType=INTEGER},#{isNotice,jdbcType=INTEGER},#{pzmc,jdbcType=VARCHAR},
+      #{isSheet,jdbcType=INTEGER},#{htbh,jdbcType=VARCHAR},#{cblx,jdbcType=VARCHAR},#{ysid,jdbcType=VARCHAR},
+      #{ytzdid,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessNoticeReceive" >
     insert into business_notice_receive
@@ -295,6 +298,9 @@
       <if test="ysid != null">
         ysid,
       </if>
+      <if test="ytzdid != null">
+        ytzdid,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -417,6 +423,9 @@
       <if test="ysid != null">
         #{ysid,jdbcType=VARCHAR},
       </if>
+      <if test="ytzdid != null">
+        #{ytzdid,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.business.model.BusinessNoticeReceiveExample" resultType="java.lang.Integer" >
@@ -548,6 +557,9 @@
       <if test="record.ysid != null">
         ysid = #{record.ysid,jdbcType=VARCHAR},
       </if>
+      <if test="record.ytzdid != null">
+        ytzdid = #{record.ytzdid,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -594,7 +606,8 @@
       is_sheet = #{record.isSheet,jdbcType=INTEGER},
       htbh = #{record.htbh,jdbcType=VARCHAR},
       cblx = #{record.cblx,jdbcType=VARCHAR},
-      ysid = #{record.ysid,jdbcType=VARCHAR}
+      ysid = #{record.ysid,jdbcType=VARCHAR},
+      ytzdid = #{record.ytzdid,jdbcType=VARCHAR}
       
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -720,6 +733,9 @@
       <if test="ysid != null">
         ysid = #{ysid,jdbcType=VARCHAR},
       </if>
+      <if test="ytzdid != null">
+        ytzdid = #{ytzdid,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -763,7 +779,8 @@
       is_sheet = #{isSheet,jdbcType=INTEGER},
       htbh = #{htbh,jdbcType=VARCHAR},
       cblx = #{cblx,jdbcType=VARCHAR},
-      ysid = #{ysid,jdbcType=VARCHAR}
+      ysid = #{ysid,jdbcType=VARCHAR},
+      ytzdid = #{ytzdid,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   

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

@@ -25,6 +25,7 @@ public class BusinessNoticeReceive {
     private String htbh;
     private String cblx;
     private String ysid;
+    private String ytzdid;//原通知单ID
 
     /**
      * 0是性质转变单
@@ -857,4 +858,20 @@ public class BusinessNoticeReceive {
 		this.ysid = ysid;
 	}
 
+	/**
+	 * 原通知单ID
+	 * @return
+	 */
+	public String getYtzdid() {
+		return ytzdid;
+	}
+
+	/**
+	 * 原通知单ID
+	 * @param ytzdid
+	 */
+	public void setYtzdid(String ytzdid) {
+		this.ytzdid = ytzdid;
+	}
+
 }

src/main/java/com/chinaitop/depot/business/service/impl/ReceiveNoticeServiceImpl.java

@@ -195,6 +195,8 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
             if(selectByExample.size()>0){//存在修改(只修改出库期限)
                 BusinessNoticeReceive record = new BusinessNoticeReceive();
                 record.setId(selectByExample.get(0).getId());
+                String  lsyqsl = jsonObject.getString("lsyqsl");
+                record.setCount(lsyqsl); //计划数量（吨）
                 record.setOutgoingPeriod(jsonObject.getString("ckqx"));
             	int k = businessNoticeReceiveMapper.updateByPrimaryKeySelective(record);
             	if(k<0){
@@ -348,6 +350,11 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
                 				businessNoticeReceive.setAuditState(5);//下达未审批
                 				businessNoticeReceive.setReceiveTime(new Date());//接收数据的时间
                 				//businessNoticeReceive.setSfzswtzd("0"); //接收通知单菜单不展示该数据
+                				String ytzdid = jsonObject.getString("ytzdid");
+                				if (StringUtils.isNotBlank(ytzdid)) {//有值的话就代表是变更的通知单，不需要生成性质转变单
+                					businessNoticeReceive.setIsSheet(1);//这是属于通知单变更，不需要重新生成性质转变单
+                					businessNoticeReceive.setYtzdid(ytzdid);
+                				}
                 				businessNoticeReceiveMapper.insert(businessNoticeReceive);
                             } else {//出库类型
                                 //根据仓房、货位、orgId获取粮食品种等信息
@@ -402,6 +409,12 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
                     				businessNoticeReceive.setAuditState(0);//下达未审批
                     				businessNoticeReceive.setReceiveTime(new Date());//接收数据的时间
                     				//businessNoticeReceive.setSfzswtzd("0"); //接收通知单菜单不展示该数据
+                    				String ytzdid = jsonObject.getString("ytzdid");
+                    				if (StringUtils.isNotBlank(ytzdid)) {//有值的话就代表是变更的通知单，不需要生成性质转变单
+                    					businessNoticeReceive.setIsSheet(1);//这是属于通知单变更，不需要重新生成性质转变单
+                    					businessNoticeReceive.setYtzdid(ytzdid);
+                    					businessNoticeReceive.setAuditState(5);//状态设置为审批通过
+                    				}
                     				businessNoticeReceiveMapper.insert(businessNoticeReceive);
                     			} else {
                     				modelMap.put("msg", "根据所传信息没有查到对应库存信息");
@@ -616,7 +629,7 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 		parameters[1] = receiveNotice.getGrainKind() + "";
 		parameters[2] = receiveNotice.getGrainDetailKind()+"";//明细品种
 		parameters[3] = receiveNotice.getHouseId() + "";
-		if (StringUtils.isNotBlank(receiveNotice.getWareHouseId()+"")) {//粮仓
+		if (receiveNotice.getWareHouseId() != null) {//粮仓
 			parameters[4] = receiveNotice.getWareHouseId() + "";
 		} else {
 			parameters[4] = receiveNotice.getHouseId() + "";//油罐