成品粮库存管理添加生产年月

pom.xml

@@ -148,6 +148,11 @@
             <version>1.18.22</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+		    <groupId>org.jetbrains</groupId>
+		    <artifactId>annotations</artifactId>
+		    <version>20.1.0</version>
+		</dependency>
     </dependencies>
 
     <!-- 导入Spring Cloud的依赖管理 -->

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

@@ -1,5 +1,14 @@
 package com.chinaitop.depot.business.service.impl;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.jetbrains.annotations.NotNull;
+import org.springframework.stereotype.Service;
+
 import com.chinaitop.depot.business.mapper.BusinessDrugStorageMapper;
 import com.chinaitop.depot.business.model.BusinessDrugInfo;
 import com.chinaitop.depot.business.model.BusinessDrugInfoKey;
@@ -8,14 +17,6 @@ import com.chinaitop.depot.business.model.BusinessDrugStorageExample;
 import com.chinaitop.depot.business.service.BusinessDrugInfoService;
 import com.chinaitop.depot.business.service.BusinessDrugStandingBookService;
 import com.chinaitop.depot.business.service.BusinessDrugStorageService;
-import org.jetbrains.annotations.NotNull;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 
 @Service

src/main/java/com/chinaitop/depot/product/controller/StorageProductFcbgzController.java

@@ -1,6 +1,5 @@
 package com.chinaitop.depot.product.controller;
 
-import java.math.BigDecimal;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -9,7 +8,6 @@ import java.util.Map;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -20,7 +18,6 @@ import com.chinaitop.depot.product.model.StorageProductFcbgzExample;
 import com.chinaitop.depot.product.model.StorageProductKcsl;
 import com.chinaitop.depot.product.service.StorageProductFcbgzService;
 import com.chinaitop.depot.product.service.StorageProductKcslService;
-import com.chinaitop.depot.utils.JsonToObjectUtils;
 import com.chinaitop.depot.utils.ParameterUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -29,6 +26,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * @auther mafy

src/main/java/com/chinaitop/depot/product/mapper/StorageProductKcslMapper.xml

@@ -15,6 +15,7 @@
     <result column="kcsl" property="kcsl" jdbcType="DECIMAL" />
     <result column="input_time" property="inputTime" jdbcType="TIMESTAMP" />
     <result column="hdsj" property="hdsj" jdbcType="TIMESTAMP" />
+    <result column="scny" property="scny" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <where >
@@ -75,7 +76,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List" >
-    id, org_id, house_id, warehouse_id, lypz, lyxz, lydj, lycd, rksj, scrq, kcsl, input_time, hdsj
+    id, org_id, house_id, warehouse_id, lypz, lyxz, lydj, lycd, rksj, scrq, kcsl, input_time, hdsj, scny
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.product.model.StorageProductKcslExample" >
     select
@@ -111,13 +112,13 @@
     insert into storage_product_kcsl (id, org_id, house_id, 
       warehouse_id, lypz, lyxz, 
       lydj, lycd, rksj, 
-      scrq, kcsl, input_time, hdsj
+      scrq, kcsl, input_time, hdsj, scny
       )
     values (#{id,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, #{houseId,jdbcType=INTEGER}, 
       #{warehouseId,jdbcType=INTEGER}, #{lypz,jdbcType=INTEGER}, #{lyxz,jdbcType=INTEGER}, 
       #{lydj,jdbcType=INTEGER}, #{lycd,jdbcType=INTEGER}, #{rksj,jdbcType=TIMESTAMP}, 
       #{scrq,jdbcType=TIMESTAMP}, #{kcsl,jdbcType=DECIMAL}, #{inputTime,jdbcType=TIMESTAMP},
-      #{hdsj,jdbcType=TIMESTAMP})
+      #{hdsj,jdbcType=TIMESTAMP}, #{scny,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.product.model.StorageProductKcsl" >
     insert into storage_product_kcsl
@@ -161,6 +162,9 @@
       <if test="hdsj != null">
       	hdsj,
       </if>
+      <if test="scny != null">
+      	scny,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -202,6 +206,9 @@
       <if test="hdsj != null">
       	#{hdsj,jdbcType=TIMESTAMP},
       </if>
+      <if test="scny != null">
+      	#{scny,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.product.model.StorageProductKcslExample" resultType="java.lang.Integer" >
@@ -252,6 +259,9 @@
       <if test="record.hdsj != null">
       	hdsj = #{record.hdsj,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.scny != null">
+      	scny = #{record.scny,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -271,7 +281,8 @@
       scrq = #{record.scrq,jdbcType=TIMESTAMP},
       kcsl = #{record.kcsl,jdbcType=DECIMAL},
       input_time = #{record.inputTime,jdbcType=TIMESTAMP},
-      hdsj = #{record.hdsj,jdbcType=TIMESTAMP}
+      hdsj = #{record.hdsj,jdbcType=TIMESTAMP},
+      scny = #{record.scny,jdbcType=VARCHAR}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -315,6 +326,9 @@
       <if test="hdsj != null">
       	hdsj = #{hdsj,jdbcType=TIMESTAMP},
       </if>
+      <if test="scny != null">
+      	scny = #{scny,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -331,7 +345,8 @@
       scrq = #{scrq,jdbcType=TIMESTAMP},
       kcsl = #{kcsl,jdbcType=DECIMAL},
       input_time = #{inputTime,jdbcType=TIMESTAMP},
-      hdsj = #{hdsj,jdbcType=TIMESTAMP}
+      hdsj = #{hdsj,jdbcType=TIMESTAMP},
+      scny = #{scny,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 

src/main/java/com/chinaitop/depot/product/model/StorageProductKcsl.java

@@ -29,6 +29,8 @@ public class StorageProductKcsl {
     private Date inputTime;
     
     private Date hdsj;
+    
+    private String scny;
 
     /**
      * ID
@@ -237,4 +239,21 @@ public class StorageProductKcsl {
 	public void setHdsj(Date hdsj) {
 		this.hdsj = hdsj;
 	}
+
+	/**
+	 * 生产年月
+	 * @return
+	 */
+	public String getScny() {
+		return scny;
+	}
+
+	/**
+	 * 生产年月
+	 * @param scny
+	 */
+	public void setScny(String scny) {
+		this.scny = scny;
+	}
+
 }

src/main/java/com/chinaitop/depot/product/service/impl/StorageProductKcslServiceImpl.java

@@ -23,6 +23,8 @@ import com.chinaitop.depot.product.model.StorageProductFcbgz;
 import com.chinaitop.depot.product.model.StorageProductKcsl;
 import com.chinaitop.depot.product.model.StorageProductKcslExample;
 import com.chinaitop.depot.product.service.StorageProductKcslService;
+import com.chinaitop.depot.utils.ParameterUtil;
+
 import org.springframework.transaction.annotation.Transactional;
 
 @Service
@@ -129,6 +131,9 @@ public class StorageProductKcslServiceImpl implements StorageProductKcslService
 		String crk_bz = ""; //0出库，1入库
 		if (null != kcsl) {
 			kcsl.setHdsj(new Date());
+			String scny = ParameterUtil.datetime2string(fcbgz.getProductionDate());
+			scny = scny.substring(0, 7);//只要年和月
+			kcsl.setScny(scny);
 			kcs = kcsl.getKcsl();
 
 			//入库
@@ -175,6 +180,9 @@ public class StorageProductKcslServiceImpl implements StorageProductKcslService
 			kcsl.setRksj(fcbgz.getRecordDate());
 			kcsl.setScrq(fcbgz.getProductionDate());
 			kcsl.setOrgId(fcbgz.getOrgId());
+			String scny = ParameterUtil.datetime2string(fcbgz.getProductionDate());
+			scny = scny.substring(0, 7);//只要年和月
+			kcsl.setScny(scny);
 			//入库
 			if (StringUtils.isNotBlank(fcbgz.getStorageQuantity()) && !"0".equals(fcbgz.getStorageQuantity())) {
 				BigDecimal rksl = new BigDecimal(fcbgz.getStorageQuantity());