出库出库原因，库存

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

@@ -5,14 +5,14 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        out_id, out_no, out_type, from_id, from_no, org_id, staff_id, cus_id, sup_id, out_status, outing_qty, outing_amt, out_qty, out_amt, return_qty, return_amt, out_date, remarks, annex_paths, make_staff, make_time, receivable_id, payable_id, flg_valid, cp_id
+        out_id, out_no, out_type, from_id, from_no, org_id, staff_id, cus_id, sup_id, out_status, outing_qty, outing_amt, out_qty, out_amt, return_qty, return_amt, out_date, remarks, annex_paths, make_staff, make_time, receivable_id, payable_id, flg_valid, cp_id,out_reason
     </sql>
 
     <sql id="Base_Column_List_Response">
         tpo.out_id, tpo.out_no, tpo.out_type, tpo.from_id, tpo.from_no, tpo.org_id, tpo.staff_id,
         tpo.cus_id, tpo.sup_id, tpo.out_status, tpo.outing_qty, tpo.outing_amt, tpo.out_qty, tpo.out_amt,
         tpo.return_qty, tpo.return_amt, tpo.out_date, tpo.remarks, tpo.annex_paths, tpo.make_staff,
-        tpo.make_time, tpo.receivable_id, tpo.payable_id, tpo.flg_valid, tpo.cp_id
+        tpo.make_time, tpo.receivable_id, tpo.payable_id, tpo.flg_valid, tpo.cp_id,tpo.out_reason
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -49,6 +49,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="out_reason" property="outReason" typeHandler="UuidTypeHandler"/>
     </resultMap>
 
     <!-- 通用查询映射结果 -->
@@ -92,6 +93,9 @@
         <result column="address_full" property="addressFull"/>
         <result column="channel_name" property="channelName"/>
         <result column="cus_from_name" property="cusFromName"/>
+        <result column="out_reason" property="outReason" typeHandler="UuidTypeHandler"/>
+        <result column="out_reason_name" property="outReasonName" />
+
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -240,7 +244,8 @@
                t.receivable_id,
                t.payable_id,
                t.cp_id,
-               t.flg_valid
+               t.flg_valid,
+              tmd.data_value                                   as into_reason_name
         FROM dkic_b.t_psi_outbound as t
                  left join dkic_b.t_mst_org tmo on tmo.org_id = t.org_id
                  Left join dkic_b.t_mst_supplier tmp on tmp.sup_id = t.sup_id
@@ -250,6 +255,7 @@
                  left join dkic_b.t_mst_dictionary_data tmdd on tmdd.data_id = tmc.cus_from
                  left join sys.t_data_kind as tdk1 on tdk1.kind_code = t.out_status
                  LEFT JOIN sys.t_data_kind tdktype   ON tdktype.kind_code = t.out_type
+                 left join dkic_b.t_mst_dictionary_data tmd on tmd.data_id = t.out_reason
         <include refid="Condition"/>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
@@ -261,8 +267,17 @@
         SELECT
         count(1)
         FROM dkic_b.t_psi_outbound as t
-                left join dkic_b.t_mst_customer tmc on t.cus_id = tmc.cus_id
+        left join dkic_b.t_mst_org tmo on tmo.org_id = t.org_id
+        Left join dkic_b.t_mst_supplier tmp on tmp.sup_id = t.sup_id
+        left join dkic_b.t_mst_staff tms on tms.staff_id = t.staff_id
+        left join dkic_b.t_mst_staff as makestaff on makestaff.staff_id = t.make_staff
+        left join dkic_b.t_mst_customer tmc on tmc.cus_id = t.cus_id
+        left join dkic_b.t_mst_dictionary_data tmdd on tmdd.data_id = tmc.cus_from
+        left join sys.t_data_kind as tdk1 on tdk1.kind_code = t.out_status
+        LEFT JOIN sys.t_data_kind tdktype   ON tdktype.kind_code = t.out_type
+        left join dkic_b.t_mst_dictionary_data tmd on tmd.data_id = t.out_reason
         <include refid="Condition"/>
+
     </select>
 
     <!-- 根据主键查询表dkic_b.t_psi_outbound的一行数据 -->
@@ -312,7 +327,8 @@
                t.receivable_id,
                t.payable_id,
                t.cp_id,
-               t.flg_valid
+               t.flg_valid,
+               tmd.data_value                                   as into_reason_name
         FROM dkic_b.t_psi_outbound as t
                  left join dkic_b.t_psi_order as tpo1 on tpo1.order_id = t.from_id
                  left join dkic_b.t_mst_sale_channel tmsc on tmsc.channel_id = tpo1.sales_channel
@@ -322,6 +338,7 @@
                  left join dkic_b.t_mst_customer tmc on tmc.cus_id = t.cus_id
                  left join dkic_b.t_mst_dictionary_data tmdd on tmdd.data_id = tmc.cus_from
                  left join sys.t_data_kind as tdk1 on tdk1.kind_code = t.out_status
+                 left join dkic_b.t_mst_dictionary_data tmd on tmd.data_id = t.out_reason
         WHERE t.out_id = #{id}::uuid
     </select>
 

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

@@ -17,6 +17,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -126,10 +127,10 @@ public class InventoryBatch extends PageInfo<InventoryBatch> implements Serializ
      * 账务日期
      */
     @Excel(name = "账务日期")
-    @ApiModelProperty(value = "账务日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime accDate;
+    @ApiModelProperty(value = "入库日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class, updateStrategy = FieldStrategy.IGNORED)
+    private LocalDate accDate;
 
 
     /**

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

@@ -318,6 +318,11 @@ public class Outbound extends PageInfo<Outbound> implements Serializable {
     private String opDbUser;
 
 
+
+    @ApiModelProperty(value = "出库原因")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String outReason;
+
     /*
      * 相关属性
      * @TableField(exist = false)

src/main/java/com/dk/mdm/model/query/ivt/InventoryBatchQuery.java

@@ -17,6 +17,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -109,11 +110,10 @@ public class InventoryBatchQuery extends PageInfo<InventoryBatchQuery> {
     /**
      * 账务日期
      */
-    @ApiModelProperty(value = "账务日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime accDate;
-
+    @ApiModelProperty(value = "入库日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class, updateStrategy = FieldStrategy.IGNORED)
+    private LocalDate accDate;
 
 
     /**

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

@@ -17,6 +17,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -116,10 +117,10 @@ public class InventoryBatchResponse {
      * 账务日期
      */
     @Excel(name = "账务日期")
-    @ApiModelProperty(value = "账务日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime accDate;
+    @ApiModelProperty(value = "入库日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class, updateStrategy = FieldStrategy.IGNORED)
+    private LocalDate accDate;
 
 
     /**

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

@@ -261,6 +261,17 @@ public class OutboundResponse extends PageInfo<OutboundResponse> implements Seri
     private Integer cpId;
 
 
+    @ApiModelProperty(value = "出库原因")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String outReason;
+
+
+    @Excel(name = "出库原因")
+    @ApiModelProperty(value = "出库原因")
+    private String outReasonName;
+
+
+
     @ApiModelProperty(value = "出库单明细")
     private List<OutboundItemResponse> goodsList;
 

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

@@ -17,6 +17,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -109,10 +110,10 @@ public class InventoryBatchVO  {
     /**
      * 账务日期
      */
-    @ApiModelProperty(value = "账务日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime accDate;
+    @ApiModelProperty(value = "入库日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class, updateStrategy = FieldStrategy.IGNORED)
+    private LocalDate accDate;
 
 
     /**

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

@@ -217,6 +217,10 @@ public class OutboundVO{
     private Boolean flgValid;
 
 
+    @ApiModelProperty(value = "出库原因")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String outReason;
+
     /**
      * 企业ID
      */

src/main/java/com/dk/mdm/service/ivt/inventory/InventoryService.java

@@ -12,11 +12,13 @@ import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.infrastructure.convert.ivt.InOutRecordConvert;
 import com.dk.mdm.mapper.ivt.InOutRecordMapper;
+import com.dk.mdm.mapper.ivt.InventoryBatchMapper;
 import com.dk.mdm.model.pojo.ivt.InOutRecord;
 import com.dk.mdm.model.pojo.ivt.Inventory;
 import com.dk.mdm.mapper.ivt.InventoryMapper;
 import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.pojo.ivt.InventoryBatch;
 import com.dk.mdm.model.query.ivt.InboundQuery;
 import com.dk.mdm.model.query.ivt.InventoryQuery;
 import com.dk.mdm.model.response.ivt.InboundResponse;
@@ -31,6 +33,7 @@ import org.springframework.transaction.annotation.Transactional;
 import com.dk.common.infrastructure.constant.Constant;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -57,6 +60,11 @@ public class InventoryService extends BaseService<Inventory> {
 
     @Autowired
     private InOutRecordConvert inOutRecordConvert;
+
+    @Autowired
+    private InventoryBatchMapper inventoryBatchMapper;
+
+
     /**
      * @desc   : 条件查询
      * @author : 姜永辉
@@ -282,7 +290,7 @@ public class InventoryService extends BaseService<Inventory> {
     @Transactional(
             rollbackFor = {Exception.class}
     )
-    public void insertInventory(List<InOutRecordVO> inOutRecordVOList) {
+    public List<InOutRecordVO> insertInventory(List<InOutRecordVO> inOutRecordVOList) {
         //判断库存数据是否存在，存在更细，不存在新建
         for (InOutRecordVO inOutRecordVO : inOutRecordVOList) {
             //根据sku，仓库，非标号查询
@@ -292,15 +300,47 @@ public class InventoryService extends BaseService<Inventory> {
                     .setNonStdCode(inOutRecordVO.getNonStdCode()));
             //不存在  新建
             if (inventoryResponse == null) {
-
+                Inventory inventory =  new Inventory();
+                //仓库Id
+                inventory.setWhId(inOutRecordVO.getWhId());
+                //商品id
+                inventory.setSkuId(inOutRecordVO.getSkuId());
+                //非标号
+                inventory.setNonStdCode(inOutRecordVO.getNonStdCode());
+                //库存数量
+                inventory.setInvQty(inOutRecordVO.getIntoQty());
+                //可售数量（可用量）
+                inventory.setUsableQty(inOutRecordVO.getIntoQty());
+                //库存资产
+                inventory.setCostAmt(inOutRecordVO.getIntoAmt());
+                //库存单价   存货资产/存货数量
+                inventory.setCostPrice(inventory.getCostAmt().divide(inventory.getInvQty()).setScale(2, BigDecimal.ROUND_HALF_UP));
+                //新建
+                inventoryMapper.insert(inventory);
+                //仓库Id赋值
+                inOutRecordVO.setInvId(inventory.getInvId());
+                //新建批次明细
             }
             //存在 出库校验库存是否充足重写updateById，入库加入数据
             else {
-
+                //仓库Id赋值
+                inOutRecordVO.setInvId(inventoryResponse.getInvId());
+                //新建库存批次明细
+                this.insertInventoryBatch(inOutRecordVO);
+                //跟新库存数据
+                Inventory inventory =  new Inventory();
+                //库存资产
+                inventory.setCostAmt(inOutRecordVO.getIntoAmt());
+                //新建
+                int countRow =  inventoryMapper.updateById(inventory);
+                //数量超出
+                if (countRow == 0) {
+                    throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVENTORY_QUANTITY_HAS_EXCEEDED.getMessage());
+                }
             }
         }
 
-
+        return inOutRecordVOList;
     }
 
     /**
@@ -311,8 +351,31 @@ public class InventoryService extends BaseService<Inventory> {
     @Transactional(
             rollbackFor = {Exception.class}
     )
-    public void insertInventoryBatch(List<InOutRecordVO> inOutRecordVOList) {
-
+    public InOutRecordVO insertInventoryBatch(InOutRecordVO inOutRecordVO) {
+        InventoryBatch  inventoryBatch  = new InventoryBatch();
+        //库存Id
+        inventoryBatch.setInvId(inOutRecordVO.getInvId());
+        //来源Id
+        inventoryBatch.setFromId(inOutRecordVO.getBiznisId());
+        //来源明细Id
+        inventoryBatch.setFromItemId(inOutRecordVO.getBiznisItemId());
+        //仓库Id
+        inventoryBatch.setWhId(inOutRecordVO.getWhId());
+        //商品Id
+        inventoryBatch.setSkuId(inOutRecordVO.getSkuId());
+        //非标号
+        inventoryBatch.setNonStdCode(inOutRecordVO.getNonStdCode());
+        //库存数量
+        inventoryBatch.setInvQty(inOutRecordVO.getIntoQty());
+        //库存单价
+        inventoryBatch.setCostPrice(inOutRecordVO.getPriceInto());
+        //货物资产
+        inventoryBatch.setCostAmt(inOutRecordVO.getIntoAmt());
+        //账务日期
+        inventoryBatch.setAccDate(LocalDate.now());
+        //新建
+        inventoryBatchMapper.insert(inventoryBatch);
+        return inOutRecordVO;
     }
 
 }