入库

src/main/java/com/dk/mdm/mapper/ivt/InboundMapper.xml

@@ -10,7 +10,8 @@
         into_status, intoing_qty, intoing_amt, into_qty, into_amt, return_qty,
         return_amt, into_date, remarks, annex_paths, make_staff, make_time,
         receivable_id, payable_id, flg_valid, cp_id, op_create_time, op_create_user_id,
-        op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user,wh_id
+        op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user,wh_id,
+        into_reason
     </sql>
 
 
@@ -20,7 +21,7 @@
         tpi.cus_id, tpi.sup_id, tpi.into_status, tpi.intoing_qty, tpi.intoing_amt, tpi.into_qty,
         tpi.into_amt, tpi.return_qty, tpi.return_amt, tpi.into_date, tpi.remarks, tpi.annex_paths,
         tpi.make_staff, tpi.make_time, tpi.receivable_id, tpi.payable_id, tpi.flg_valid, tpi.cp_id,
-        tpi.wh_id
+        tpi.wh_id,tpi.into_reason
     </sql>
 
 
@@ -58,6 +59,8 @@
         <result column="op_app_code" property="opAppCode"/>
         <result column="op_timestamp" property="opTimestamp" typeHandler="TimestampTypeHandler"/>
         <result column="op_db_user" property="opDbUser"/>
+        <result column="entry_reason" property="entryReason" typeHandler="UuidTypeHandler"/>
+        <result column="wh_id" property="whId"/>
     </resultMap>
 
     <!-- response查询映射结果 -->
@@ -88,6 +91,7 @@
         <result column="payable_id" property="payableId" typeHandler="UuidTypeHandler"/>
         <result column="flg_valid" property="flgValid"/>
         <result column="cp_id" property="cpId"/>
+        <result column="entry_reason" property="entryReason" typeHandler="UuidTypeHandler"/>
     </resultMap>
 
 
@@ -368,6 +372,8 @@
             payable_id,
             cp_id,
             op_app_code,
+            wh_id,
+            entry_reason,
         </trim>
         )
         values
@@ -398,6 +404,8 @@
                 #{item.payableId}::uuid,
                 #{item.cpId},
                 #{item.opAppCode},
+                #{item.whId},
+                #{item.entryReason}::uuid,
             </trim>
             )
         </foreach>

src/main/java/com/dk/mdm/mapper/ivt/IntoReturnItemMapper.xml

@@ -6,9 +6,10 @@
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
         item_id, return_id, into_id, into_item_id, pur_id, pur_item_id, item_index,
-               sku_id, item_qty, price_std, amt_std, price_return, item_amt, non_std_code,
-               out_status, outoing_qty, outoing_amt, out_qty, out_amt, remarks, flg_valid,
-               cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
+        sku_id, item_qty, price_std, amt_std, price_return, item_amt, non_std_code,
+        out_status, outoing_qty, outoing_amt, out_qty, out_amt, remarks, flg_valid,
+        cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id,
+        op_app_code, op_timestamp, op_db_user,wh_id
     </sql>
 
 
@@ -16,7 +17,7 @@
         tpiri.item_id, tpiri.return_id, tpiri.into_id, tpiri.into_item_id, tpiri.pur_id, tpiri.pur_item_id, tpiri.item_index, tpiri.sku_id, tpiri.item_qty,
                      tpiri.price_std,tpiri.amt_std, tpiri.price_return,
                tpiri.item_amt, tpiri.non_std_code, tpiri.out_status, tpiri.outing_qty, tpiri.outing_amt, tpiri.out_qty, tpiri.out_amt,
-                     tpiri.remarks, tpiri.flg_valid, tpiri.cp_id
+                     tpiri.remarks, tpiri.flg_valid, tpiri.cp_id,tpiri.wh_id
     </sql>
 
 
@@ -53,6 +54,7 @@
                 <result column="op_app_code" property="opAppCode"/>
             <result column="op_timestamp" property="opTimestamp" typeHandler="TimestampTypeHandler"/>
                 <result column="op_db_user" property="opDbUser"/>
+        <result column="wh_id" property="whId" typeHandler="UuidTypeHandler"/>
     </resultMap>
 
     <resultMap id="BaseResultMapResponse" type="com.dk.mdm.model.response.ivt.IntoReturnItemResponse">
@@ -82,7 +84,7 @@
         <result column="sku_name" property="skuName"/>
         <result column="sku_model" property="skuModel"/>
         <result column="sku_images" property="skuImages"/>
-
+        <result column="wh_id" property="whId" typeHandler="UuidTypeHandler"/>
     </resultMap>
 
 

src/main/java/com/dk/mdm/model/pojo/ivt/Inbound.java

@@ -7,6 +7,7 @@ import java.io.Serializable;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
 import com.dk.common.infrastructure.handler.*;
 import com.dk.common.model.pojo.PageInfo;
+import com.dk.common.model.vo.AnnexVO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.AllArgsConstructor;
@@ -193,10 +194,9 @@ public class Inbound extends PageInfo<Inbound> implements Serializable {
     /**
      * 附件 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)
      */
-    @Excel(name = "附件 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
-    @ApiModelProperty(value = "附件 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
+    @ApiModelProperty(value = "附件")
     @TableField(typeHandler = JsonTypeHandler.class)
-    private JSONObject annexPaths;
+    private List<AnnexVO> annexPaths;
 
 
     /**
@@ -324,6 +324,12 @@ public class Inbound extends PageInfo<Inbound> implements Serializable {
     private String whId;
 
 
+    @Excel(name = "入库原因")
+    @ApiModelProperty(value = "入库原因")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String entryReason;
+
+
 
     /*
      * 相关属性

src/main/java/com/dk/mdm/model/pojo/ivt/InboundItem.java

@@ -300,6 +300,12 @@ public class InboundItem extends PageInfo<InboundItem> implements Serializable {
     private String opDbUser;
 
 
+    @Excel(name = "入库仓库")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    @ApiModelProperty(value = "入库仓库")
+    private String whId;
+
+
     /*
      * 相关属性
      * @TableField(exist = false)

src/main/java/com/dk/mdm/model/response/ivt/InboundResponse.java

@@ -11,6 +11,7 @@ import com.dk.common.infrastructure.handler.JsonTypeHandler;
 import com.dk.common.infrastructure.handler.TimestampTypeHandler;
 import com.dk.common.infrastructure.handler.UuidTypeHandler;
 import com.dk.common.model.pojo.PageInfo;
+import com.dk.common.model.vo.AnnexVO;
 import com.dk.mdm.model.response.pur.PurchaseItemResponse;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -226,10 +227,10 @@ public class InboundResponse extends PageInfo<InboundResponse> implements Serial
     /**
      * 附件 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)
      */
-    @Excel(name = "附件 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
-    @ApiModelProperty(value = "附件 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
+    @Excel(name = "附件信息")
+    @ApiModelProperty(value = "附件信息")
     @TableField(typeHandler = JsonTypeHandler.class)
-    private JSONObject annexPaths;
+    private List<AnnexVO> AnnexPaths;
 
 
     /**
@@ -284,70 +285,10 @@ public class InboundResponse extends PageInfo<InboundResponse> implements Serial
     @ApiModelProperty(value = "企业ID")
     private Integer cpId;
 
-
-    /**
-     * 创建时间 (触发器自动处理)
-     */
-    @Excel(name = "创建时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "创建时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opCreateTime;
-
-
-    /**
-     * 创建用户 (触发器自动处理)
-     */
-    @Excel(name = "创建用户 (触发器自动处理)")
-    @ApiModelProperty(value = "创建用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opCreateUserId;
-
-
-    /**
-     * 修改时间 (触发器自动处理)
-     */
-    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opUpdateTime;
-
-
-    /**
-     * 修改用户 (触发器自动处理)
-     */
-    @Excel(name = "修改用户 (触发器自动处理)")
-    @ApiModelProperty(value = "修改用户 (触发器自动处理)")
+    @Excel(name = "企业ID")
+    @ApiModelProperty(value = "入库原因")
     @TableField(typeHandler = UuidTypeHandler.class)
-    private String opUpdateUserId;
-
-
-    /**
-     * 数据操作应用 (触发器自动处理)
-     */
-    @Excel(name = "数据操作应用 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
-    private String opAppCode;
-
-
-    /**
-     * 数据时间戳 (触发器自动处理)
-     */
-    @Excel(name = "数据时间戳 (触发器自动处理)")
-    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opTimestamp;
-
-
-    /**
-     * 数据操作数据库用户 (触发器自动处理)
-     */
-    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
-    private String opDbUser;
-
+    private String entryReason;
 
 
     /**

src/main/java/com/dk/mdm/model/response/ivt/IntoReturnItemResponse.java

@@ -225,69 +225,6 @@ public class IntoReturnItemResponse  implements Serializable {
     private Integer cpId;
 
 
-    /**
-     * 创建时间 (触发器自动处理)
-     */
-    @Excel(name = "创建时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "创建时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opCreateTime;
-
-
-    /**
-     * 创建用户 (触发器自动处理)
-     */
-    @Excel(name = "创建用户 (触发器自动处理)")
-    @ApiModelProperty(value = "创建用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opCreateUserId;
-
-
-    /**
-     * 修改时间 (触发器自动处理)
-     */
-    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opUpdateTime;
-
-
-    /**
-     * 修改用户 (触发器自动处理)
-     */
-    @Excel(name = "修改用户 (触发器自动处理)")
-    @ApiModelProperty(value = "修改用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opUpdateUserId;
-
-
-    /**
-     * 数据操作应用 (触发器自动处理)
-     */
-    @Excel(name = "数据操作应用 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
-    private String opAppCode;
-
-
-    /**
-     * 数据时间戳 (触发器自动处理)
-     */
-    @Excel(name = "数据时间戳 (触发器自动处理)")
-    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opTimestamp;
-
-
-    /**
-     * 数据操作数据库用户 (触发器自动处理)
-     */
-    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
-    private String opDbUser;
-
 
 
     @Excel(name = "商品编码")
@@ -307,6 +244,11 @@ public class IntoReturnItemResponse  implements Serializable {
     @TableField(typeHandler = JsonTypeHandler.class)
     private String skuImages;
 
+    @Excel(name = "入库仓库")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    @ApiModelProperty(value = "入库仓库")
+    private String whId;
+
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/model/vo/ivt/InboundItemVO.java

@@ -234,68 +234,10 @@ public class InboundItemVO extends PageInfo<InboundItemVO> implements Serializab
     private Integer cpId;
 
 
-    /**
-     * 创建时间 (触发器自动处理)
-     */
-    @Excel(name = "创建时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "创建时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opCreateTime;
-
-
-    /**
-     * 创建用户 (触发器自动处理)
-     */
-    @Excel(name = "创建用户 (触发器自动处理)")
-    @ApiModelProperty(value = "创建用户 (触发器自动处理)")
+    @Excel(name = "入库仓库")
     @TableField(typeHandler = UuidTypeHandler.class)
-    private String opCreateUserId;
-
-
-    /**
-     * 修改时间 (触发器自动处理)
-     */
-    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opUpdateTime;
-
-
-    /**
-     * 修改用户 (触发器自动处理)
-     */
-    @Excel(name = "修改用户 (触发器自动处理)")
-    @ApiModelProperty(value = "修改用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opUpdateUserId;
-
-
-    /**
-     * 数据操作应用 (触发器自动处理)
-     */
-    @Excel(name = "数据操作应用 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
-    private String opAppCode;
-
-
-    /**
-     * 数据时间戳 (触发器自动处理)
-     */
-    @Excel(name = "数据时间戳 (触发器自动处理)")
-    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opTimestamp;
-
-
-    /**
-     * 数据操作数据库用户 (触发器自动处理)
-     */
-    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
-    private String opDbUser;
+    @ApiModelProperty(value = "入库仓库")
+    private String whId;
 
 
     /*

src/main/java/com/dk/mdm/model/vo/ivt/InboundVO.java

@@ -11,6 +11,7 @@ import com.dk.common.infrastructure.handler.JsonTypeHandler;
 import com.dk.common.infrastructure.handler.TimestampTypeHandler;
 import com.dk.common.infrastructure.handler.UuidTypeHandler;
 import com.dk.common.model.pojo.PageInfo;
+import com.dk.common.model.vo.AnnexVO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -202,8 +203,8 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
      */
     @Excel(name = "附件 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
     @ApiModelProperty(value = "附件 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
-    @TableField(typeHandler = JsonTypeHandler.class)
-    private JSONObject annexPaths;
+    private List<AnnexVO> annexPaths;
+
 
 
     /**
@@ -331,6 +332,13 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     private String whId;
 
 
+    @Excel(name = "企业ID")
+    @ApiModelProperty(value = "入库原因")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String entryReason;
+
+
+
     /*
      * 相关属性
      * @TableField(exist = false)

src/main/java/com/dk/mdm/service/ivt/InboundOtherService.java

@@ -121,6 +121,10 @@ public class InboundOtherService extends BaseService<Inbound> {
 					.setIntoingQty(BigDecimal.ZERO)
 					.setIntoingAmt(BigDecimal.ZERO)
 			;
+		}else{
+			inboundVO.setIntoQty(BigDecimal.ZERO)
+					.setIntoAmt(BigDecimal.ZERO)
+			;
 		}
 		//实体转换
 		Inbound inbound = inboundConvert.convertToPo(inboundVO);
@@ -141,6 +145,8 @@ public class InboundOtherService extends BaseService<Inbound> {
 			inboundItemVO.setIntoId(inboundVO.getIntoId());
 			//入库类型
 			inboundItemVO.setIntoType(inboundVO.getIntoType());
+			//出库数量
+			inboundItemVO.setOutQty(BigDecimal.ZERO);
 			//入库状态等于已入库 更新合计入库数量/金额 = 入库中数量/入库中金额
 			if (Constant.IntoStatus.YIRUKU.getName().equals(inboundVO.getIntoStatus())) {
 				inboundItemVO.setIntoQty(inboundItemVO.getIntoingQty())
@@ -148,6 +154,10 @@ public class InboundOtherService extends BaseService<Inbound> {
 						.setIntoingQty(BigDecimal.ZERO)
 						.setIntoingAmt(BigDecimal.ZERO)
 				;
+			}else{
+				inboundItemVO
+						.setIntoQty(BigDecimal.ZERO)
+						.setIntoAmt(BigDecimal.ZERO);
 			}
 			//成本单价
 			inboundItemVO.setCostPrice(inboundItemVO.getCostPrice());