采购订单自动生成采购入库

src/main/java/com/dk/mdm/mapper/mst/GoodsSkuMapper.java

@@ -4,6 +4,7 @@ import com.dk.mdm.model.pojo.mst.GoodsSku;
 import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.query.mst.GoodsSkuQuery;
 import com.dk.mdm.model.query.mst.RoleQuery;
+import com.dk.mdm.model.response.ivt.OutboundResponse;
 import com.dk.mdm.model.response.mst.GoodsSkuResponse;
 import com.dk.mdm.model.response.mst.RoleResponse;
 import com.dk.mdm.model.vo.mst.GoodsSkuVO;
@@ -37,5 +38,13 @@ public interface GoodsSkuMapper extends BaseMapper<GoodsSku>{
      * @date : 2024/6/17 13:50
      */
     Boolean saveWarningList(@Param("list") List<GoodsSkuVO> goodsSkuVOS);
+
+    /**
+     * @desc   : 根据Id进行查询
+     * @date   : 2024/7/5 9:18
+     * @author : 寇珊珊
+     */
+    GoodsSkuResponse selectById(@Param("id") String id);
+
 }
 

src/main/java/com/dk/mdm/model/vo/pur/PurchaseItemVO.java

@@ -309,6 +309,10 @@ public class PurchaseItemVO extends PageInfo<PurchaseItemVO> implements Serializ
     @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
     private String opDbUser;
 
+    @ApiModelProperty(value = "仓库ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String whId;
+
 
     /*
      * 相关属性

src/main/java/com/dk/mdm/service/ivt/inbound/InboundPurchaseService.java

@@ -39,6 +39,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -191,6 +192,8 @@ public class InboundPurchaseService extends BaseService<Inbound> {
         if (inboundVO.getFlgAutoHandle()) {
             //已入库
             inboundVO.setIntoStatus(Constant.IntoStatus.YIRUKU.getName());
+            //入库日期
+            inboundVO.setIntoDate( inboundVO.getIntoDate()==null ? LocalDate.now() : inboundVO.getIntoDate() );
         } else {
             //入库中
             inboundVO.setIntoStatus(Constant.IntoStatus.RUKUZHONG.getName());

src/main/java/com/dk/mdm/service/pur/PurchaseService.java

@@ -26,6 +26,7 @@ import com.dk.mdm.model.pojo.pur.PurchaseItem;
 import com.dk.mdm.model.pojo.sale.Order;
 import com.dk.mdm.model.query.pur.PurchaseItemQuery;
 import com.dk.mdm.model.query.pur.PurchaseQuery;
+import com.dk.mdm.model.response.mst.GoodsSkuResponse;
 import com.dk.mdm.model.response.pur.PurchaseItemResponse;
 import com.dk.mdm.model.response.pur.PurchaseResponse;
 import com.dk.mdm.model.vo.ivt.InboundItemVO;
@@ -200,11 +201,15 @@ public class PurchaseService extends BaseService<Purchase> {
                 inboundItemVO.setFromItemId(purchaseItemVO.getItemId());
                 //入库价
                 inboundItemVO.setPriceInto(purchaseItemVO.getPricePur());
+                //入库中数量
+                inboundItemVO.setIntoingQty(purchaseItemVO.getItemQty());
+                //已入库数量
+                inboundItemVO.setIntoingAmt(purchaseItemVO.getItemAmt());
                 //endregion
 
                 //region 根据sku查询商品信息
                 if (inboundItemVO.getSkuId() != null) {
-                    GoodsSku goodsSku = goodsSkuMapper.selectById(inboundItemVO.getSkuId());
+                    GoodsSkuResponse goodsSku = goodsSkuMapper.selectById(inboundItemVO.getSkuId());
                     //商品名称
                     inboundItemVO.setSkuName(goodsSku.getSkuName());
                     //商品型号