供应商

src/main/java/com/dk/mdm/model/vo/mst/GoodsSkuVO.java

@@ -38,7 +38,12 @@ public class GoodsSkuVO implements Serializable {
     /*
      * 数据库字段
      */
-
+    /**
+     * 组织ID
+     */
+    @TableId(value = "org_id", type = IdType.AUTO)
+    @ApiModelProperty(value = "组织ID")
+    private String orgId;
     /**
      * 商品ID
      */

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

@@ -70,7 +70,7 @@ public class InboundCheckService extends BaseService<Inbound> {
 
 
     /**
-     * @desc : 盘盈入库新建、库存调整-入库
+     * @desc : 盘盈入库新建、库存调整-入库  \ 新建商品档案->期初入库
      * @date : 2024/3/7 14:13
      * 入库中数量/金额  已入库数量/金额  由调用方传入
      * @author : 寇珊珊
@@ -160,6 +160,10 @@ public class InboundCheckService extends BaseService<Inbound> {
             if(Constant.IntoType.PROFIT.getName().equals(inboundVO.getIntoType())){
                 inboundItemVO.setInventoryDocCode(Constant.InventoryDocCode.INVENTORY_PROFIT.getValue());
             }
+            //期初入库
+            if(Constant.IntoType.BEGIN.getName().equals(inboundVO.getIntoType())){
+                inboundItemVO.setInventoryDocCode(Constant.InventoryDocCode.INVENTORY_BEGIN.getValue());
+            }
             //仓库调整
             else{
                 inboundItemVO.setInventoryDocCode(Constant.InventoryDocCode.MOVE.getValue());

src/main/java/com/dk/mdm/service/mst/GoodsSkuService.java

@@ -6,24 +6,36 @@ import com.dk.common.model.pojo.PageList;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.infrastructure.convert.mst.GoodsSkuConvert;
+import com.dk.mdm.infrastructure.util.AuthUtils;
 import com.dk.mdm.model.pojo.mst.GoodsSku;
 import com.dk.mdm.mapper.mst.GoodsSkuMapper;
 import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.pojo.mst.Role;
+import com.dk.mdm.model.query.mac.OtherReceivableItemQuery;
 import com.dk.mdm.model.query.mst.GoodsSkuQuery;
 import com.dk.mdm.model.query.mst.RoleQuery;
+import com.dk.mdm.model.response.mac.OtherReceivableItemResponse;
 import com.dk.mdm.model.response.mst.GoodsSkuResponse;
 import com.dk.mdm.model.response.mst.RoleResponse;
 import com.dk.mdm.model.vo.ivt.InOutRecordVO;
+import com.dk.mdm.model.vo.ivt.InboundItemVO;
+import com.dk.mdm.model.vo.ivt.InboundVO;
 import com.dk.mdm.model.vo.mst.GoodsSkuVO;
 import com.dk.mdm.model.vo.mst.RoleVo;
 import com.dk.mdm.service.common.CommonService;
+import com.dk.mdm.service.ivt.inbound.InboundCheckService;
 import com.dk.mdm.service.ivt.inventory.InventoryService;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Service
@@ -43,6 +55,9 @@ public class GoodsSkuService extends BaseService<GoodsSku> {
 	private GoodsSkuConvert goodsSkuConvert;
 
 	@Autowired
+	private InboundCheckService inboundCheckService;
+
+	@Autowired
 	InventoryService inventoryService;
  /**
      * @desc   : 重写组件
@@ -55,6 +70,8 @@ public class GoodsSkuService extends BaseService<GoodsSku> {
 	}
 	@Autowired
 	private CommonService commonService;
+	@Autowired
+	private AuthUtils authUtils;
 	/**
 	 * @desc : 查询
 	 * @author : 王英杰
@@ -83,14 +100,40 @@ public class GoodsSkuService extends BaseService<GoodsSku> {
 		goodsSku.setSkuId(codeMap.get("outId").toString());
 		goodsSku.setSkuCode(codeMap.get("outNote").toString());
 		super.insert(goodsSku);
-		InOutRecordVO inOutRecordVO = new InOutRecordVO();
-		inOutRecordVO.setWhId(goodsSkuVO.getWhId());
-		inOutRecordVO.setSkuId(goodsSku.getSkuId());
-		inOutRecordVO.setNonStdCode(goodsSkuVO.getNonStdCode());
-		inOutRecordVO.setIntoQty(goodsSkuVO.getIntoQty());
-		inOutRecordVO.setIntoAmt(goodsSkuVO.getIntoAmt());
-		if(inOutRecordVO.getWhId()!=null){
-			inventoryService.insertInventoryw(inOutRecordVO);
+
+		if(goodsSkuVO.getWhId()!=null){
+			  String StaffId = authUtils.getStaff().getStaffId();
+
+			//总单
+			InboundVO inboundVO = new InboundVO();
+			inboundVO.setIntoType(Constant.IntoType.BEGIN.getName());
+			inboundVO.setIntoingQty(goodsSkuVO.getIntoQty());
+			inboundVO.setIntoingAmt(goodsSkuVO.getIntoAmt());
+			inboundVO.setStaffId(StaffId);
+			inboundVO.setMakeStaff(StaffId);
+			inboundVO.setOrgId(goodsSkuVO.getOrgId());
+			inboundVO.setMakeTime(LocalDateTime.now());
+			inboundVO.setIntoDate(LocalDate.now());
+			inboundVO.setWhId(goodsSkuVO.getWhId());
+			inboundVO.setFlgAutoHandle(true);
+
+            //明细
+			List<InboundItemVO> inboundItemVOList = new ArrayList<>();
+			InboundItemVO inboundItemVO = new InboundItemVO();
+			inboundItemVO.setIntoingQty(goodsSkuVO.getIntoQty());
+			inboundItemVO.setIntoingAmt(goodsSkuVO.getIntoAmt());
+			inboundItemVO.setPriceInto(goodsSkuVO.getIntoAmt());
+			inboundItemVO.setIntoQty(goodsSkuVO.getIntoQty());
+			inboundItemVO.setItemIndex(0);
+			inboundItemVO.setSkuId(goodsSku.getSkuId());
+			inboundItemVO.setWhId(goodsSkuVO.getWhId());
+			inboundItemVO.setNonStdCode(goodsSkuVO.getNonStdCode());
+			inboundItemVOList.add(inboundItemVO);
+
+			Map<String, Object> map = new HashMap<>();
+			map.put("total",inboundVO);
+			map.put("detail",inboundItemVOList);
+			inboundCheckService.checkInboundInsert(map);
 		}
 		return ResponseResultUtil.success();
 	}