生成入库单据功能 接收单据质检功能

ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/domain/BasProduct.java

@@ -78,5 +78,9 @@ public class BasProduct extends BaseEntity
      * 数量
      */
     private String quantity;
+    /**
+     * 批号
+     */
+    private String lotNo;
 
 }

ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/mapper/InStockinDetailMapper.java

@@ -2,18 +2,19 @@ package com.ruoyi.in.stockindetail.mapper;
 
 import java.util.List;
 import com.ruoyi.in.stockindetail.domain.InStockinDetail;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 入库单据子表Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2025-05-20
  */
-public interface InStockinDetailMapper 
+public interface InStockinDetailMapper
 {
     /**
      * 查询入库单据子表
-     * 
+     *
      * @param stockinDetailId 入库单据子表主键
      * @return 入库单据子表
      */
@@ -21,7 +22,7 @@ public interface InStockinDetailMapper
 
     /**
      * 查询入库单据子表列表
-     * 
+     *
      * @param inStockinDetail 入库单据子表
      * @return 入库单据子表集合
      */
@@ -29,7 +30,7 @@ public interface InStockinDetailMapper
 
     /**
      * 新增入库单据子表
-     * 
+     *
      * @param inStockinDetail 入库单据子表
      * @return 结果
      */
@@ -37,7 +38,7 @@ public interface InStockinDetailMapper
 
     /**
      * 修改入库单据子表
-     * 
+     *
      * @param inStockinDetail 入库单据子表
      * @return 结果
      */
@@ -45,7 +46,7 @@ public interface InStockinDetailMapper
 
     /**
      * 删除入库单据子表
-     * 
+     *
      * @param stockinDetailId 入库单据子表主键
      * @return 结果
      */
@@ -53,9 +54,11 @@ public interface InStockinDetailMapper
 
     /**
      * 批量删除入库单据子表
-     * 
+     *
      * @param stockinDetailIds 需要删除的数据主键集合
      * @return 结果
      */
     public int deleteInStockinDetailByStockinDetailIds(String[] stockinDetailIds);
+
+    void insertInStockinDetailList(@Param("list") List<InStockinDetail> inStockinDetailList);
 }

ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/IInStockinDetailService.java

@@ -5,15 +5,15 @@ import com.ruoyi.in.stockindetail.domain.InStockinDetail;
 
 /**
  * 入库单据子表Service接口
- * 
+ *
  * @author ruoyi
  * @date 2025-05-20
  */
-public interface IInStockinDetailService 
+public interface IInStockinDetailService
 {
     /**
      * 查询入库单据子表
-     * 
+     *
      * @param stockinDetailId 入库单据子表主键
      * @return 入库单据子表
      */
@@ -21,7 +21,7 @@ public interface IInStockinDetailService
 
     /**
      * 查询入库单据子表列表
-     * 
+     *
      * @param inStockinDetail 入库单据子表
      * @return 入库单据子表集合
      */
@@ -29,7 +29,7 @@ public interface IInStockinDetailService
 
     /**
      * 新增入库单据子表
-     * 
+     *
      * @param inStockinDetail 入库单据子表
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface IInStockinDetailService
 
     /**
      * 修改入库单据子表
-     * 
+     *
      * @param inStockinDetail 入库单据子表
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface IInStockinDetailService
 
     /**
      * 批量删除入库单据子表
-     * 
+     *
      * @param stockinDetailIds 需要删除的入库单据子表主键集合
      * @return 结果
      */
@@ -53,9 +53,15 @@ public interface IInStockinDetailService
 
     /**
      * 删除入库单据子表信息
-     * 
+     *
      * @param stockinDetailId 入库单据子表主键
      * @return 结果
      */
     public int deleteInStockinDetailByStockinDetailId(String stockinDetailId);
+
+    /**
+     * 批量插入入库子单
+     * @param inStockinDetailList
+     */
+    void insertInStockinDetailList(List<InStockinDetail> inStockinDetailList);
 }

ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java

@@ -9,19 +9,19 @@ import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
 
 /**
  * 入库单据子表Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2025-05-20
  */
 @Service
-public class InStockinDetailServiceImpl implements IInStockinDetailService 
+public class InStockinDetailServiceImpl implements IInStockinDetailService
 {
     @Autowired
     private InStockinDetailMapper inStockinDetailMapper;
 
     /**
      * 查询入库单据子表
-     * 
+     *
      * @param stockinDetailId 入库单据子表主键
      * @return 入库单据子表
      */
@@ -33,7 +33,7 @@ public class InStockinDetailServiceImpl implements IInStockinDetailService
 
     /**
      * 查询入库单据子表列表
-     * 
+     *
      * @param inStockinDetail 入库单据子表
      * @return 入库单据子表
      */
@@ -45,7 +45,7 @@ public class InStockinDetailServiceImpl implements IInStockinDetailService
 
     /**
      * 新增入库单据子表
-     * 
+     *
      * @param inStockinDetail 入库单据子表
      * @return 结果
      */
@@ -57,7 +57,7 @@ public class InStockinDetailServiceImpl implements IInStockinDetailService
 
     /**
      * 修改入库单据子表
-     * 
+     *
      * @param inStockinDetail 入库单据子表
      * @return 结果
      */
@@ -69,7 +69,7 @@ public class InStockinDetailServiceImpl implements IInStockinDetailService
 
     /**
      * 批量删除入库单据子表
-     * 
+     *
      * @param stockinDetailIds 需要删除的入库单据子表主键
      * @return 结果
      */
@@ -81,7 +81,7 @@ public class InStockinDetailServiceImpl implements IInStockinDetailService
 
     /**
      * 删除入库单据子表信息
-     * 
+     *
      * @param stockinDetailId 入库单据子表主键
      * @return 结果
      */
@@ -90,4 +90,9 @@ public class InStockinDetailServiceImpl implements IInStockinDetailService
     {
         return inStockinDetailMapper.deleteInStockinDetailByStockinDetailId(stockinDetailId);
     }
+
+    @Override
+    public void insertInStockinDetailList(List<InStockinDetail> inStockinDetailList) {
+        inStockinDetailMapper.insertInStockinDetailList(inStockinDetailList);
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/controller/ReceiveStockinController.java

@@ -3,20 +3,17 @@ package com.ruoyi.receive.stockin.controller;
 import java.io.IOException;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.receive.stockin.domain.vo.ReceiveProductVo;
+import com.ruoyi.receive.stockin.domain.vo.ReceiveStockCreateInVo;
+import com.ruoyi.receive.stockin.domain.vo.ReceiveStockQualityInsVo;
 import com.ruoyi.receive.stockin.domain.vo.ReceiveStockVo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -81,11 +78,27 @@ public class ReceiveStockinController extends BaseController
     @PreAuthorize("@ss.hasPermi('receive:stockin:add')")
     @Log(title = "收货单据", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody ReceiveStockVo receiveStockin)
+    public AjaxResult add( @RequestBody @Valid ReceiveStockVo receiveStockin)
     {
         return receiveStockinService.insertReceiveStockin(receiveStockin);
     }
 
+    /**
+     * 新增入库单据
+     * @param receiveStockin
+     * @return
+     */
+    @PreAuthorize("@ss.hasPermi('receive:Stockin:createInStock')")
+    @Log(title = "新增入库单据", businessType = BusinessType.INSERT)
+    @PostMapping("/createStockin")
+    public AjaxResult createStockin(@RequestBody ReceiveStockCreateInVo receiveStockin)
+    {
+        return receiveStockinService.createStockin(receiveStockin);
+    }
+
+
+
+
     /**
      * 导入收货单据
      */

ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/domain/vo/ReceiveProductVo.java

@@ -6,16 +6,21 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+import javax.validation.constraints.NotEmpty;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @ToString
 public class ReceiveProductVo {
     @Excel(name = "物料编码")
+    @NotEmpty(message = "物料GUID不能为空")
     private String productGuid;
     @Excel(name = "物料数量")
+    @NotEmpty(message = "物料数量不能为空")
     private String quantity;
     @Excel(name = "批次号")
+    @NotEmpty(message = "批次号不能为空")
     private String lotNo;
 
 

ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/domain/vo/ReceiveStockCreateInVo.java

@@ -0,0 +1,14 @@
+package com.ruoyi.receive.stockin.domain.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReceiveStockCreateInVo {
+    private List<String> stockinGuidList;
+}

ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/domain/vo/ReceiveStockDetailQualityInsVo.java

@@ -0,0 +1,15 @@
+package com.ruoyi.receive.stockin.domain.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReceiveStockDetailQualityInsVo {
+    //子单据id
+    private String stockinDetailId;
+    //质检数量
+    private String quantity;
+}

ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/domain/vo/ReceiveStockQualityInsVo.java

@@ -0,0 +1,21 @@
+package com.ruoyi.receive.stockin.domain.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+public class ReceiveStockQualityInsVo {
+
+    private String stockinGuid;
+
+    private List<ReceiveStockDetailQualityInsVo> list;
+}

ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/domain/vo/ReceiveStockVo.java

@@ -14,11 +14,11 @@ import java.util.List;
 @NoArgsConstructor
 @ToString
 public class ReceiveStockVo {
-    @NotBlank
+    @NotBlank(message = "仓库不能为空")
     private String warehouseId;
-    @NotBlank
+    @NotBlank(message = "供应商不能为空")
     private String supplierId;
     private String remark;
-    @NotEmpty
+    @NotEmpty(message = "商品不能为空")
     private List<ReceiveProductVo> productVoList;
 }

ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/mapper/ReceiveStockinMapper.java

@@ -5,15 +5,15 @@ import com.ruoyi.receive.stockin.domain.ReceiveStockin;
 
 /**
  * 收货单据Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2025-05-20
  */
-public interface ReceiveStockinMapper 
+public interface ReceiveStockinMapper
 {
     /**
      * 查询收货单据
-     * 
+     *
      * @param stockinGuid 收货单据主键
      * @return 收货单据
      */
@@ -21,7 +21,7 @@ public interface ReceiveStockinMapper
 
     /**
      * 查询收货单据列表
-     * 
+     *
      * @param receiveStockin 收货单据
      * @return 收货单据集合
      */
@@ -29,7 +29,7 @@ public interface ReceiveStockinMapper
 
     /**
      * 新增收货单据
-     * 
+     *
      * @param receiveStockin 收货单据
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface ReceiveStockinMapper
 
     /**
      * 修改收货单据
-     * 
+     *
      * @param receiveStockin 收货单据
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface ReceiveStockinMapper
 
     /**
      * 删除收货单据
-     * 
+     *
      * @param stockinGuid 收货单据主键
      * @return 结果
      */
@@ -53,9 +53,15 @@ public interface ReceiveStockinMapper
 
     /**
      * 批量删除收货单据
-     * 
+     *
      * @param stockinGuids 需要删除的数据主键集合
      * @return 结果
      */
     public int deleteReceiveStockinByStockinGuids(String[] stockinGuids);
+
+    /**
+     * 插入历史表
+     * @param receiveStockinGuid
+     */
+    void insertReceiveStockinHistory(String receiveStockinGuid);
 }

ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/IReceiveStockinService.java

@@ -5,6 +5,8 @@ import java.util.List;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.receive.stockin.domain.ReceiveStockin;
 import com.ruoyi.receive.stockin.domain.vo.ReceiveProductVo;
+import com.ruoyi.receive.stockin.domain.vo.ReceiveStockCreateInVo;
+import com.ruoyi.receive.stockin.domain.vo.ReceiveStockQualityInsVo;
 import com.ruoyi.receive.stockin.domain.vo.ReceiveStockVo;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -70,4 +72,12 @@ public interface IReceiveStockinService
      * @return
      */
     AjaxResult analyseExportFile(List<ReceiveProductVo> list );
+
+    /**
+     * 创建入库单据
+     * @param receiveStockin
+     * @return
+     */
+    AjaxResult createStockin(ReceiveStockCreateInVo receiveStockin);
+
 }

ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/impl/ReceiveStockinServiceImpl.java

@@ -1,21 +1,27 @@
 package com.ruoyi.receive.stockin.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
 import cn.hutool.Hutool;
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import com.ruoyi.bas.BasProduct.domain.BasProduct;
 import com.ruoyi.bas.BasProduct.service.IBasProductService;
+import com.ruoyi.bas.basJobId.service.IBasJobIdService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
-import com.ruoyi.receive.stockin.domain.vo.ReceiveProductVo;
+import com.ruoyi.in.stockin.domain.InStockin;
-import com.ruoyi.receive.stockin.domain.vo.ReceiveStockVo;
+import com.ruoyi.in.stockin.service.IInStockinService;
+import com.ruoyi.in.stockindetail.domain.InStockinDetail;
+import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
+import com.ruoyi.receive.stockin.domain.vo.*;
 import com.ruoyi.receive.stockindetail.domain.ReceiveStockinDetail;
 import com.ruoyi.receive.stockindetail.service.IReceiveStockinDetailService;
 import com.ruoyi.receive.stockindetail.service.impl.ReceiveStockinDetailServiceImpl;
@@ -42,6 +48,12 @@ public class ReceiveStockinServiceImpl implements IReceiveStockinService
     private IReceiveStockinDetailService iReceiveStockinDetailService;
     @Autowired
     private IBasProductService iBasProductService;
+    @Autowired
+    private IInStockinDetailService iInStockinDetailService;
+    @Autowired
+    private IInStockinService inStockinServicel;
+    @Autowired
+    private IBasJobIdService iBasJobIdService;
 
     /**
      * 查询收货单据
@@ -90,9 +102,10 @@ public class ReceiveStockinServiceImpl implements IReceiveStockinService
         receiveStockin.setStockSource("1");
         //receiveStockin.setSpare1(receiveStockVo.getBatchId());
         receiveStockin.setCreateManId(Convert.toStr(SecurityUtils.getUserId()));
-        receiveStockin.setStockinId(IdUtil.fastSimpleUUID());
+        receiveStockin.setStockinId(iBasJobIdService.getJobId("RED"));
         receiveStockin.setStatus("0");
         receiveStockinMapper.insertReceiveStockin(receiveStockin);
+        int i = 1;
         for (ReceiveProductVo receiveProductVo : productVoList) {
             BasProduct basProduct = iBasProductService.selectBasProductByProductGuid(receiveProductVo.getProductGuid());
             ReceiveStockinDetail receiveStockinDetail = new ReceiveStockinDetail();
@@ -101,7 +114,7 @@ public class ReceiveStockinServiceImpl implements IReceiveStockinService
             receiveStockinDetail.setProductId(basProduct.getProductId());
             receiveStockinDetail.setStockinGuid(receiveStockin.getStockinGuid());
             receiveStockinDetail.setStockinId(receiveStockin.getStockinId());
-            receiveStockinDetail.setStockinDetailId(IdUtil.fastSimpleUUID());
+            receiveStockinDetail.setStockinDetailId(receiveStockin.getStockinId()+"-"+i++);
             receiveStockinDetail.setUnit(basProduct.getUnit());
             receiveStockinDetail.setSpec(basProduct.getSpec());
             receiveStockinDetail.setSpare1(basProduct.getSpare1());
@@ -170,9 +183,107 @@ public class ReceiveStockinServiceImpl implements IReceiveStockinService
         for (BasProduct basProduct : result) {
             Optional<ReceiveProductVo> first = list.stream().filter(x -> x.getProductGuid().equals(basProduct.getProductGuid())).findFirst();
             first.ifPresent(receiveProductVo -> basProduct.setQuantity(receiveProductVo.getQuantity()));
+            first.ifPresent(receiveProductVo -> basProduct.setLotNo(receiveProductVo.getLotNo()));
         }
         return AjaxResult.success(result);
     }
 
+    /**
+     * 创建入库单据
+     * @param receiveStockCreateInVo
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult createStockin(ReceiveStockCreateInVo receiveStockCreateInVo) {
+        try {
+            List<String> stockinGuidList = receiveStockCreateInVo.getStockinGuidList();
+            if (CollUtil.isNotEmpty(stockinGuidList)){
+                for (String receiveStockinGuid : stockinGuidList) {
+                    ReceiveStockin receiveStockin = selectReceiveStockinByStockinGuid(receiveStockinGuid);
+                    ReceiveStockinDetail receiveStockinDetailParam = new ReceiveStockinDetail();
+                    receiveStockinDetailParam.setStockinGuid(receiveStockinGuid);
+                    List<ReceiveStockinDetail> list = iReceiveStockinDetailService.selectReceiveStockinDetailList(receiveStockinDetailParam);
+                    if (CollUtil.isNotEmpty(list)){
+                        Optional<ReceiveStockinDetail> first = list.stream().filter(x -> x.getStockStatus().equals("0")).findFirst();
+                        if (first.isPresent()){
+                            ReceiveStockinDetail receiveStockinDetail = first.get();
+                            return AjaxResult.error("编号:"+receiveStockinDetail.getProductId()+",未质检");
+                        }
+
+                        InStockin inStockin = getInStockinByReceiveStockin(receiveStockin);
+                        //插入入库单据
+                        inStockinServicel.insertInStockin(inStockin);
+                        List<InStockinDetail> inStockinDetailList = getInStockinDetailByReceiveStockin(inStockin,list);
+                        //插入入库单据详情
+                        iInStockinDetailService.insertInStockinDetailList(inStockinDetailList);
+                        //修改单据状态
+                        receiveStockin.setStatus("1");
+                        receiveStockinMapper.updateReceiveStockin(receiveStockin);
+                        //插入历史接收单据
+                        receiveStockinMapper.insertReceiveStockinHistory(receiveStockinGuid);
+                        //插入历史接收单据子单详情
+                        iReceiveStockinDetailService.insertReceiveStockinDetailHistory(receiveStockinGuid);
+                        //删除接收单据
+                        receiveStockinMapper.deleteReceiveStockinByStockinGuid(receiveStockinGuid);
+                        //删除接收单据子单详情
+                        List<String> receiveStockinDetailIdList = list.stream().map(ReceiveStockinDetail::getStockinDetailId).collect(Collectors.toList());
+                        iReceiveStockinDetailService.deleteReceiveStockinDetailByStockinDetailIds(Convert.toStrArray(receiveStockinDetailIdList));
+
+                    }
+                }
+            }
+
+        }catch (Exception e){
+            throw new RuntimeException(e);
+        }
+        return AjaxResult.success();
+    }
+
+
+
+    /**
+     * 获取入库子单详情
+     *
+     * @param inStockin
+     * @param list
+     * @return
+     */
+    private List<InStockinDetail> getInStockinDetailByReceiveStockin(InStockin inStockin, List<ReceiveStockinDetail> list) {
+        if (CollUtil.isEmpty(list)){
+            return null;
+        }
+        List<InStockinDetail> inStockinDetailList = new ArrayList<>();
+        int i = 1;
+        for (ReceiveStockinDetail receiveStockinDetail : list) {
+            InStockinDetail inStockinDetail = new InStockinDetail();
+            BeanUtil.copyProperties(receiveStockinDetail,inStockinDetail);
+            inStockinDetail.setStockinGuid(inStockin.getStockinGuid());
+            inStockinDetail.setStockinDetailId(inStockin.getStockinId()+"-"+i++);
+            inStockinDetail.setStockinId(inStockin.getStockinId());
+            inStockinDetail.setStockStatus("0");
+            inStockinDetailList.add(inStockinDetail);
+        }
+        return inStockinDetailList;
+    }
+
+    /**
+     * 获取入库单据
+     * @param receiveStockin
+     * @return
+     */
+    private InStockin getInStockinByReceiveStockin(ReceiveStockin receiveStockin) {
+        if (receiveStockin == null) {
+            return null;
+        }
+        InStockin inStockin = new InStockin();
+        BeanUtil.copyProperties(receiveStockin,inStockin );
+        inStockin.setStockinGuid(IdUtil.fastSimpleUUID());
+        inStockin.setStockinId(iBasJobIdService.getJobId("RKD"));
+        // 设置状态等默认值
+        inStockin.setStatus("1");
+        return inStockin;
+    }
+
 
 }

ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/controller/ReceiveStockinDetailController.java

@@ -2,6 +2,8 @@ package com.ruoyi.receive.stockindetail.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.receive.stockin.domain.vo.ReceiveStockQualityInsVo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -23,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 收货单据子单Controller
- * 
+ *
  * @author ruoyi
  * @date 2025-05-20
  */
@@ -101,4 +103,17 @@ public class ReceiveStockinDetailController extends BaseController
     {
         return toAjax(receiveStockinDetailService.deleteReceiveStockinDetailByStockinDetailIds(stockinDetailIds));
     }
+
+    /**
+     * 质检收货子单据
+     * @param receiveStockQualityInsVo
+     * @return
+     */
+    @PreAuthorize("@ss.hasPermi('receive:stockInDetail:qualityInspection')")
+    @Log(title = "质检收货子单据", businessType = BusinessType.INSERT)
+    @PostMapping("/qualityInspection")
+    public AjaxResult qualityInspection(@RequestBody ReceiveStockQualityInsVo receiveStockQualityInsVo)
+    {
+        return receiveStockinDetailService.qualityInspection(receiveStockQualityInsVo);
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/mapper/ReceiveStockinDetailMapper.java

@@ -58,4 +58,6 @@ public interface ReceiveStockinDetailMapper
      * @return 结果
      */
     public int deleteReceiveStockinDetailByStockinDetailIds(String[] stockinDetailIds);
+
+    void insertReceiveStockinDetailHistory(String receiveStockinGuid);
 }

ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/service/IReceiveStockinDetailService.java

@@ -1,19 +1,22 @@
 package com.ruoyi.receive.stockindetail.service;
 
 import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.receive.stockin.domain.vo.ReceiveStockQualityInsVo;
 import com.ruoyi.receive.stockindetail.domain.ReceiveStockinDetail;
 
 /**
  * 收货单据子单Service接口
- * 
+ *
  * @author ruoyi
  * @date 2025-05-20
  */
-public interface IReceiveStockinDetailService 
+public interface IReceiveStockinDetailService
 {
     /**
      * 查询收货单据子单
-     * 
+     *
      * @param stockinDetailId 收货单据子单主键
      * @return 收货单据子单
      */
@@ -21,7 +24,7 @@ public interface IReceiveStockinDetailService
 
     /**
      * 查询收货单据子单列表
-     * 
+     *
      * @param receiveStockinDetail 收货单据子单
      * @return 收货单据子单集合
      */
@@ -29,7 +32,7 @@ public interface IReceiveStockinDetailService
 
     /**
      * 新增收货单据子单
-     * 
+     *
      * @param receiveStockinDetail 收货单据子单
      * @return 结果
      */
@@ -37,7 +40,7 @@ public interface IReceiveStockinDetailService
 
     /**
      * 修改收货单据子单
-     * 
+     *
      * @param receiveStockinDetail 收货单据子单
      * @return 结果
      */
@@ -45,7 +48,7 @@ public interface IReceiveStockinDetailService
 
     /**
      * 批量删除收货单据子单
-     * 
+     *
      * @param stockinDetailIds 需要删除的收货单据子单主键集合
      * @return 结果
      */
@@ -53,9 +56,22 @@ public interface IReceiveStockinDetailService
 
     /**
      * 删除收货单据子单信息
-     * 
+     *
      * @param stockinDetailId 收货单据子单主键
      * @return 结果
      */
     public int deleteReceiveStockinDetailByStockinDetailId(String stockinDetailId);
+
+    /**
+     * 插入历史数据
+     * @param receiveStockinGuid
+     */
+    void insertReceiveStockinDetailHistory(String receiveStockinGuid);
+
+    /**
+     * 质检收货子单据
+     * @param receiveStockQualityInsVo
+     * @return
+     */
+    AjaxResult qualityInspection(ReceiveStockQualityInsVo receiveStockQualityInsVo);
 }

ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/service/impl/ReceiveStockinDetailServiceImpl.java

@@ -1,27 +1,33 @@
 package com.ruoyi.receive.stockindetail.service.impl;
 
 import java.util.List;
+
+import cn.hutool.core.collection.CollUtil;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.receive.stockin.domain.vo.ReceiveStockDetailQualityInsVo;
+import com.ruoyi.receive.stockin.domain.vo.ReceiveStockQualityInsVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.receive.stockindetail.mapper.ReceiveStockinDetailMapper;
 import com.ruoyi.receive.stockindetail.domain.ReceiveStockinDetail;
 import com.ruoyi.receive.stockindetail.service.IReceiveStockinDetailService;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 收货单据子单Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2025-05-20
  */
 @Service
-public class ReceiveStockinDetailServiceImpl implements IReceiveStockinDetailService 
+public class ReceiveStockinDetailServiceImpl implements IReceiveStockinDetailService
 {
     @Autowired
     private ReceiveStockinDetailMapper receiveStockinDetailMapper;
 
     /**
      * 查询收货单据子单
-     * 
+     *
      * @param stockinDetailId 收货单据子单主键
      * @return 收货单据子单
      */
@@ -33,7 +39,7 @@ public class ReceiveStockinDetailServiceImpl implements IReceiveStockinDetailSer
 
     /**
      * 查询收货单据子单列表
-     * 
+     *
      * @param receiveStockinDetail 收货单据子单
      * @return 收货单据子单
      */
@@ -45,7 +51,7 @@ public class ReceiveStockinDetailServiceImpl implements IReceiveStockinDetailSer
 
     /**
      * 新增收货单据子单
-     * 
+     *
      * @param receiveStockinDetail 收货单据子单
      * @return 结果
      */
@@ -57,7 +63,7 @@ public class ReceiveStockinDetailServiceImpl implements IReceiveStockinDetailSer
 
     /**
      * 修改收货单据子单
-     * 
+     *
      * @param receiveStockinDetail 收货单据子单
      * @return 结果
      */
@@ -69,7 +75,7 @@ public class ReceiveStockinDetailServiceImpl implements IReceiveStockinDetailSer
 
     /**
      * 批量删除收货单据子单
-     * 
+     *
      * @param stockinDetailIds 需要删除的收货单据子单主键
      * @return 结果
      */
@@ -81,7 +87,7 @@ public class ReceiveStockinDetailServiceImpl implements IReceiveStockinDetailSer
 
     /**
      * 删除收货单据子单信息
-     * 
+     *
      * @param stockinDetailId 收货单据子单主键
      * @return 结果
      */
@@ -90,4 +96,26 @@ public class ReceiveStockinDetailServiceImpl implements IReceiveStockinDetailSer
     {
         return receiveStockinDetailMapper.deleteReceiveStockinDetailByStockinDetailId(stockinDetailId);
     }
+
+    @Override
+    public void insertReceiveStockinDetailHistory(String receiveStockinGuid) {
+        receiveStockinDetailMapper.insertReceiveStockinDetailHistory(receiveStockinGuid);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult qualityInspection(ReceiveStockQualityInsVo receiveStockQualityInsVo) {
+        if (CollUtil.isEmpty(receiveStockQualityInsVo.getList())){
+            return AjaxResult.error("请选择质检项");
+        }
+        for (ReceiveStockDetailQualityInsVo receiveStockDetailQualityInsVo : receiveStockQualityInsVo.getList()) {
+            ReceiveStockinDetail receiveStockinDetail = selectReceiveStockinDetailByStockinDetailId(receiveStockDetailQualityInsVo.getStockinDetailId());
+            if ("0".equals(receiveStockinDetail.getStockStatus())){
+                receiveStockinDetail.setQuantity(receiveStockDetailQualityInsVo.getQuantity());
+                receiveStockinDetail.setStockStatus("1");
+                updateReceiveStockinDetail(receiveStockinDetail);
+            }
+        }
+        return AjaxResult.success();
+    }
 }

ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.in.stockindetail.mapper.InStockinDetailMapper">
-    
+
     <resultMap type="InStockinDetail" id="InStockinDetailResult">
         <result property="stockinDetailId"    column="stockin_detail_id"    />
         <result property="stockinGuid"    column="stockin_guid"    />
@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectInStockinDetailList" parameterType="InStockinDetail" resultMap="InStockinDetailResult">
         <include refid="selectInStockinDetailVo"/>
-        <where>  
+        <where>
             <if test="stockinGuid != null  and stockinGuid != ''"> and stockin_guid = #{stockinGuid}</if>
             <if test="stockinId != null  and stockinId != ''"> and stockin_id = #{stockinId}</if>
             <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
@@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare6 != null  and spare6 != ''"> and spare6 = #{spare6}</if>
         </where>
     </select>
-    
+
     <select id="selectInStockinDetailByStockinDetailId" parameterType="String" resultMap="InStockinDetailResult">
         <include refid="selectInStockinDetailVo"/>
         where stockin_detail_id = #{stockinDetailId}
@@ -135,6 +135,73 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare6 != null">#{spare6},</if>
          </trim>
     </insert>
+    <insert id="insertInStockinDetailList">
+        INSERT INTO in_stockin_detail
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <!-- 动态选择字段 -->
+            <if test="list[0].stockinDetailId != null">stockin_detail_id,</if>
+            <if test="list[0].stockinGuid != null and list[0].stockinGuid != ''">stockin_guid,</if>
+            <if test="list[0].stockinId != null and list[0].stockinId != ''">stockin_id,</if>
+            <if test="list[0].lotNo != null and list[0].lotNo != ''">lot_no,</if>
+            <if test="list[0].productGuid != null">product_guid,</if>
+            <if test="list[0].productId != null and list[0].productId != ''">product_id,</if>
+            <if test="list[0].quantity != null">quantity,</if>
+            <if test="list[0].quantityX != null">quantity_x,</if>
+            <if test="list[0].quantityJ != null">quantity_j,</if>
+            <if test="list[0].price != null">price,</if>
+            <if test="list[0].cargoNo != null">cargo_no,</if>
+            <if test="list[0].remark != null">remark,</if>
+            <if test="list[0].assignNum != null">assign_num,</if>
+            <if test="list[0].assignNumX != null">assign_num_x,</if>
+            <if test="list[0].assignNumJ != null">assign_num_j,</if>
+            <if test="list[0].printDate != null">print_date,</if>
+            <if test="list[0].stockStatus != null">stock_status,</if>
+            <if test="list[0].supplierId != null">supplier_id,</if>
+            <if test="list[0].customerId != null">customer_id,</if>
+            <if test="list[0].unit != null">unit,</if>
+            <if test="list[0].spec != null">spec,</if>
+            <if test="list[0].spare1 != null">spare1,</if>
+            <if test="list[0].spare2 != null">spare2,</if>
+            <if test="list[0].spare3 != null">spare3,</if>
+            <if test="list[0].spare4 != null">spare4,</if>
+            <if test="list[0].spare5 != null">spare5,</if>
+            <if test="list[0].spare6 != null">spare6,</if>
+        </trim>
+
+        <!-- values 部分：遍历列表插入多行 -->
+        VALUES
+        <foreach collection="list" item="item" separator=",">
+            <trim prefix="(" suffix=")" suffixOverrides=",">
+                <if test="item.stockinDetailId != null">#{item.stockinDetailId},</if>
+                <if test="item.stockinGuid != null and item.stockinGuid != ''">#{item.stockinGuid},</if>
+                <if test="item.stockinId != null and item.stockinId != ''">#{item.stockinId},</if>
+                <if test="item.lotNo != null and item.lotNo != ''">#{item.lotNo},</if>
+                <if test="item.productGuid != null">#{item.productGuid},</if>
+                <if test="item.productId != null and item.productId != ''">#{item.productId},</if>
+                <if test="item.quantity != null">#{item.quantity},</if>
+                <if test="item.quantityX != null">#{item.quantityX},</if>
+                <if test="item.quantityJ != null">#{item.quantityJ},</if>
+                <if test="item.price != null">#{item.price},</if>
+                <if test="item.cargoNo != null">#{item.cargoNo},</if>
+                <if test="item.remark != null">#{item.remark},</if>
+                <if test="item.assignNum != null">#{item.assignNum},</if>
+                <if test="item.assignNumX != null">#{item.assignNumX},</if>
+                <if test="item.assignNumJ != null">#{item.assignNumJ},</if>
+                <if test="item.printDate != null">#{item.printDate},</if>
+                <if test="item.stockStatus != null">#{item.stockStatus},</if>
+                <if test="item.supplierId != null">#{item.supplierId},</if>
+                <if test="item.customerId != null">#{item.customerId},</if>
+                <if test="item.unit != null">#{item.unit},</if>
+                <if test="item.spec != null">#{item.spec},</if>
+                <if test="item.spare1 != null">#{item.spare1},</if>
+                <if test="item.spare2 != null">#{item.spare2},</if>
+                <if test="item.spare3 != null">#{item.spare3},</if>
+                <if test="item.spare4 != null">#{item.spare4},</if>
+                <if test="item.spare5 != null">#{item.spare5},</if>
+                <if test="item.spare6 != null">#{item.spare6},</if>
+            </trim>
+        </foreach>
+    </insert>
 
     <update id="updateInStockinDetail" parameterType="InStockinDetail">
         update in_stockin_detail
@@ -174,9 +241,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteInStockinDetailByStockinDetailIds" parameterType="String">
-        delete from in_stockin_detail where stockin_detail_id in 
+        delete from in_stockin_detail where stockin_detail_id in
         <foreach item="stockinDetailId" collection="array" open="(" separator="," close=")">
             #{stockinDetailId}
         </foreach>
     </delete>
-</mapper>
+</mapper>

ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.receive.stockindetail.mapper.ReceiveStockinDetailMapper">
-    
+
     <resultMap type="ReceiveStockinDetail" id="ReceiveStockinDetailResult">
         <result property="stockinDetailId"    column="stockin_detail_id"    />
         <result property="stockinGuid"    column="stockin_guid"    />
@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectReceiveStockinDetailList" parameterType="ReceiveStockinDetail" resultMap="ReceiveStockinDetailResult">
         <include refid="selectReceiveStockinDetailVo"/>
-        <where>  
+        <where>
             <if test="stockinGuid != null  and stockinGuid != ''"> and stockin_guid = #{stockinGuid}</if>
             <if test="stockinId != null  and stockinId != ''"> and stockin_id = #{stockinId}</if>
             <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
@@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare6 != null  and spare6 != ''"> and spare6 = #{spare6}</if>
         </where>
     </select>
-    
+
     <select id="selectReceiveStockinDetailByStockinDetailId" parameterType="String" resultMap="ReceiveStockinDetailResult">
         <include refid="selectReceiveStockinDetailVo"/>
         where stockin_detail_id = #{stockinDetailId}
@@ -135,6 +135,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare6 != null">#{spare6},</if>
          </trim>
     </insert>
+    <insert id="insertReceiveStockinDetailHistory">
+        insert into receive_stockin_detail_finish
+        select * from receive_stockin_detail where stockin_guid = #{receiveStockinGuid}
+    </insert>
 
     <update id="updateReceiveStockinDetail" parameterType="ReceiveStockinDetail">
         update receive_stockin_detail
@@ -174,9 +178,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteReceiveStockinDetailByStockinDetailIds" parameterType="String">
-        delete from receive_stockin_detail where stockin_detail_id in 
+        delete from receive_stockin_detail where stockin_detail_id in
         <foreach item="stockinDetailId" collection="array" open="(" separator="," close=")">
             #{stockinDetailId}
         </foreach>
     </delete>
-</mapper>
+</mapper>

ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.receive.stockin.mapper.ReceiveStockinMapper">
-    
+
     <resultMap type="ReceiveStockin" id="ReceiveStockinResult">
         <result property="stockinGuid"    column="stockin_guid"    />
         <result property="stockinId"    column="stockin_id"    />
@@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectReceiveStockinList" parameterType="ReceiveStockin" resultMap="ReceiveStockinResult">
         <include refid="selectReceiveStockinVo"/>
-        <where>  
+        <where>
             <if test="stockinId != null  and stockinId != ''"> and stockin_id = #{stockinId}</if>
             <if test="inType != null  and inType != ''"> and in_type = #{inType}</if>
             <if test="createDate != null  and createDate != ''"> and create_date = #{createDate}</if>
@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="supplierNo != null  and supplierNo != ''"> and supplier_no = #{supplierNo}</if>
         </where>
     </select>
-    
+
     <select id="selectReceiveStockinByStockinGuid" parameterType="String" resultMap="ReceiveStockinResult">
         <include refid="selectReceiveStockinVo"/>
         where stockin_guid = #{stockinGuid}
@@ -104,6 +104,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="supplierNo != null">#{supplierNo},</if>
          </trim>
     </insert>
+    <insert id="insertReceiveStockinHistory">
+        insert into receive_stockin_finish
+        select * from receive_stockin where stockin_guid = #{stockinGuid}
+    </insert>
 
     <update id="updateReceiveStockin" parameterType="ReceiveStockin">
         update receive_stockin
@@ -135,9 +139,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteReceiveStockinByStockinGuids" parameterType="String">
-        delete from receive_stockin where stockin_guid in 
+        delete from receive_stockin where stockin_guid in
         <foreach item="stockinGuid" collection="array" open="(" separator="," close=")">
             #{stockinGuid}
         </foreach>
     </delete>
-</mapper>
+</mapper>

ruoyi-ui/src/api/receive/stockInDetail.js

@@ -42,3 +42,12 @@ export function delStockInDetail(stockinDetailId) {
     method: 'delete'
   })
 }
+
+// 质检收货子单据
+export function qualityInspection(data) {
+  return request({
+    url: '/receive/stockInDetail/qualityInspection',
+    method: 'post',
+    data: data
+  })
+}

ruoyi-ui/src/api/receive/stockin.js

@@ -17,6 +17,15 @@ export function getStockin(stockinGuid) {
   })
 }
 
+//创建入库单据
+export function createStockin(data) {
+  return request({
+    url: '/receive/stockin/createStockin',
+    method: 'post',
+    data: data
+  })
+}
+
 // 新增收货单据
 export function addStockin(data) {
   return request({

ruoyi-ui/src/views/in/stockIn/index.vue

@@ -9,7 +9,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="入库类型" prop="inType">
+<!--      <el-form-item label="入库类型" prop="inType">
         <el-select v-model="queryParams.inType" placeholder="请选择入库类型" clearable>
           <el-option
             v-for="dict in dict.type.in_bill_type"
@@ -102,7 +102,7 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
 <!--      <el-form-item label="备用字段1" prop="spare1">
         <el-input
           v-model="queryParams.spare1"
@@ -220,14 +220,14 @@
         </template>
       </el-table-column>
       <el-table-column label="部门编码" align="center" prop="departmentNo" />
-      <el-table-column label="客户编码" align="center" prop="customerNo" />
+<!--      <el-table-column label="客户编码" align="center" prop="customerNo" />-->
       <el-table-column label="班组编码" align="center" prop="classNo" />
       <el-table-column label="供应商编码" align="center" prop="supplierNo" />
-      <el-table-column label="备用字段1" align="center" prop="spare1" />
+<!--      <el-table-column label="备用字段1" align="center" prop="spare1" />
       <el-table-column label="备用字段2" align="center" prop="spare2" />
       <el-table-column label="备用字段4" align="center" prop="spare4" />
       <el-table-column label="备用字段3" align="center" prop="spare3" />
-      <el-table-column label="备用字段5" align="center" prop="spare5" />
+      <el-table-column label="备用字段5" align="center" prop="spare5" />-->
 <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -259,7 +259,7 @@
     <el-table v-loading="detailLoading" :data="stockInDetailList" @selection-change="handleSelectionChange"  >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="子单ID" align="center" prop="stockinDetailId" />
-      <el-table-column label="主单GUID" align="center" prop="stockinGuid" />
+<!--      <el-table-column label="主单GUID" align="center" prop="stockinGuid" />-->
       <el-table-column label="主单ID" align="center" prop="stockinId" />
       <el-table-column label="批次号" align="center" prop="lotNo" />
       <el-table-column label="物料ID" align="center" prop="productGuid" />
@@ -275,16 +275,16 @@
       <el-table-column label="实际数量(件)" align="center" prop="assignNumJ" />
       <el-table-column label="入库日期" align="center" prop="printDate" />
       <el-table-column label="单据状态" align="center" prop="stockStatus" />
-      <el-table-column label="供应商编码" align="center" prop="supplierId" />
+<!--      <el-table-column label="供应商编码" align="center" prop="supplierId" />
-      <el-table-column label="客户编码" align="center" prop="customerId" />
+      <el-table-column label="客户编码" align="center" prop="customerId" />-->
       <el-table-column label="单位" align="center" prop="unit" />
       <el-table-column label="规格" align="center" prop="spec" />
-      <el-table-column label="备用字段1" align="center" prop="spare1" />
+<!--      <el-table-column label="备用字段1" align="center" prop="spare1" />
       <el-table-column label="备用字段2" align="center" prop="spare2" />
       <el-table-column label="备用字段3" align="center" prop="spare3" />
       <el-table-column label="备用字段4" align="center" prop="spare4" />
       <el-table-column label="备用字段5" align="center" prop="spare5" />
-      <el-table-column label="备用字段6" align="center" prop="spare6" />
+      <el-table-column label="备用字段6" align="center" prop="spare6" />-->
 <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -317,7 +317,7 @@
 <script>
 import { listStockIn, getStockIn, delStockIn, addStockIn, updateStockIn } from "@/api/in/stockIn"
 import { listStockInDetail } from "@/api/in/stockInDetail"
-import dict from "@/utils/dict";
+
 
 export default {
   name: "StockIn",
@@ -397,7 +397,6 @@ export default {
     this.getList()
   },
   methods: {
-    dict,
     /** 查询入库单据列表 */
     getList() {
       this.loading = true

ruoyi-ui/src/views/in/stockInDetail/index.vue

@@ -1,521 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="主单GUID" prop="stockinGuid">
-        <el-input
-          v-model="queryParams.stockinGuid"
-          placeholder="请输入主单GUID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="主单ID" prop="stockinId">
-        <el-input
-          v-model="queryParams.stockinId"
-          placeholder="请输入主单ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="批次号" prop="lotNo">
-        <el-input
-          v-model="queryParams.lotNo"
-          placeholder="请输入批次号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="物料ID" prop="productGuid">
-        <el-input
-          v-model="queryParams.productGuid"
-          placeholder="请输入物料ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="物料编码" prop="productId">
-        <el-input
-          v-model="queryParams.productId"
-          placeholder="请输入物料编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="参考单价" prop="price">
-        <el-input
-          v-model="queryParams.price"
-          placeholder="请输入参考单价"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="品牌" prop="cargoNo">
-        <el-input
-          v-model="queryParams.cargoNo"
-          placeholder="请输入品牌"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="入库日期" prop="printDate">
-        <el-input
-          v-model="queryParams.printDate"
-          placeholder="请输入入库日期"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="供应商编码" prop="supplierId">
-        <el-input
-          v-model="queryParams.supplierId"
-          placeholder="请输入供应商编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="客户编码" prop="customerId">
-        <el-input
-          v-model="queryParams.customerId"
-          placeholder="请输入客户编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单位" prop="unit">
-        <el-input
-          v-model="queryParams.unit"
-          placeholder="请输入单位"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="规格" prop="spec">
-        <el-input
-          v-model="queryParams.spec"
-          placeholder="请输入规格"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备用字段1" prop="spare1">
-        <el-input
-          v-model="queryParams.spare1"
-          placeholder="请输入备用字段1"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备用字段2" prop="spare2">
-        <el-input
-          v-model="queryParams.spare2"
-          placeholder="请输入备用字段2"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备用字段3" prop="spare3">
-        <el-input
-          v-model="queryParams.spare3"
-          placeholder="请输入备用字段3"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备用字段4" prop="spare4">
-        <el-input
-          v-model="queryParams.spare4"
-          placeholder="请输入备用字段4"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备用字段5" prop="spare5">
-        <el-input
-          v-model="queryParams.spare5"
-          placeholder="请输入备用字段5"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备用字段6" prop="spare6">
-        <el-input
-          v-model="queryParams.spare6"
-          placeholder="请输入备用字段6"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['in:stockInDetail:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['in:stockInDetail:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['in:stockInDetail:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['in:stockInDetail:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="stockInDetailList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="子单ID" align="center" prop="stockinDetailId" />
-      <el-table-column label="主单GUID" align="center" prop="stockinGuid" />
-      <el-table-column label="主单ID" align="center" prop="stockinId" />
-      <el-table-column label="批次号" align="center" prop="lotNo" />
-      <el-table-column label="物料ID" align="center" prop="productGuid" />
-      <el-table-column label="物料编码" align="center" prop="productId" />
-      <el-table-column label="计划数量" align="center" prop="quantity" />
-      <el-table-column label="计划数量(箱)" align="center" prop="quantityX" />
-      <el-table-column label="计划数量(件)" align="center" prop="quantityJ" />
-      <el-table-column label="参考单价" align="center" prop="price" />
-      <el-table-column label="品牌" align="center" prop="cargoNo" />
-      <el-table-column label="描述" align="center" prop="remark" />
-      <el-table-column label="实际数量" align="center" prop="assignNum" />
-      <el-table-column label="实际数量(箱)" align="center" prop="assignNumX" />
-      <el-table-column label="实际数量(件)" align="center" prop="assignNumJ" />
-      <el-table-column label="入库日期" align="center" prop="printDate" />
-      <el-table-column label="单据状态" align="center" prop="stockStatus" />
-      <el-table-column label="供应商编码" align="center" prop="supplierId" />
-      <el-table-column label="客户编码" align="center" prop="customerId" />
-      <el-table-column label="单位" align="center" prop="unit" />
-      <el-table-column label="规格" align="center" prop="spec" />
-      <el-table-column label="备用字段1" align="center" prop="spare1" />
-      <el-table-column label="备用字段2" align="center" prop="spare2" />
-      <el-table-column label="备用字段3" align="center" prop="spare3" />
-      <el-table-column label="备用字段4" align="center" prop="spare4" />
-      <el-table-column label="备用字段5" align="center" prop="spare5" />
-      <el-table-column label="备用字段6" align="center" prop="spare6" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['in:stockInDetail:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['in:stockInDetail:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改入库单据子表对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="主单GUID" prop="stockinGuid">
-          <el-input v-model="form.stockinGuid" placeholder="请输入主单GUID" />
-        </el-form-item>
-        <el-form-item label="主单ID" prop="stockinId">
-          <el-input v-model="form.stockinId" placeholder="请输入主单ID" />
-        </el-form-item>
-        <el-form-item label="批次号" prop="lotNo">
-          <el-input v-model="form.lotNo" placeholder="请输入批次号" />
-        </el-form-item>
-        <el-form-item label="物料ID" prop="productGuid">
-          <el-input v-model="form.productGuid" placeholder="请输入物料ID" />
-        </el-form-item>
-        <el-form-item label="物料编码" prop="productId">
-          <el-input v-model="form.productId" placeholder="请输入物料编码" />
-        </el-form-item>
-        <el-form-item label="参考单价" prop="price">
-          <el-input v-model="form.price" placeholder="请输入参考单价" />
-        </el-form-item>
-        <el-form-item label="品牌" prop="cargoNo">
-          <el-input v-model="form.cargoNo" placeholder="请输入品牌" />
-        </el-form-item>
-        <el-form-item label="描述" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入描述" />
-        </el-form-item>
-        <el-form-item label="入库日期" prop="printDate">
-          <el-input v-model="form.printDate" placeholder="请输入入库日期" />
-        </el-form-item>
-        <el-form-item label="供应商编码" prop="supplierId">
-          <el-input v-model="form.supplierId" placeholder="请输入供应商编码" />
-        </el-form-item>
-        <el-form-item label="客户编码" prop="customerId">
-          <el-input v-model="form.customerId" placeholder="请输入客户编码" />
-        </el-form-item>
-        <el-form-item label="单位" prop="unit">
-          <el-input v-model="form.unit" placeholder="请输入单位" />
-        </el-form-item>
-        <el-form-item label="规格" prop="spec">
-          <el-input v-model="form.spec" placeholder="请输入规格" />
-        </el-form-item>
-        <el-form-item label="备用字段1" prop="spare1">
-          <el-input v-model="form.spare1" placeholder="请输入备用字段1" />
-        </el-form-item>
-        <el-form-item label="备用字段2" prop="spare2">
-          <el-input v-model="form.spare2" placeholder="请输入备用字段2" />
-        </el-form-item>
-        <el-form-item label="备用字段3" prop="spare3">
-          <el-input v-model="form.spare3" placeholder="请输入备用字段3" />
-        </el-form-item>
-        <el-form-item label="备用字段4" prop="spare4">
-          <el-input v-model="form.spare4" placeholder="请输入备用字段4" />
-        </el-form-item>
-        <el-form-item label="备用字段5" prop="spare5">
-          <el-input v-model="form.spare5" placeholder="请输入备用字段5" />
-        </el-form-item>
-        <el-form-item label="备用字段6" prop="spare6">
-          <el-input v-model="form.spare6" placeholder="请输入备用字段6" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listStockInDetail, getStockInDetail, delStockInDetail, addStockInDetail, updateStockInDetail } from "@/api/in/stockInDetail"
-
-export default {
-  name: "StockInDetail",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 入库单据子表表格数据
-      stockInDetailList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        stockinGuid: null,
-        stockinId: null,
-        lotNo: null,
-        productGuid: null,
-        productId: null,
-        quantity: null,
-        quantityX: null,
-        quantityJ: null,
-        price: null,
-        cargoNo: null,
-        assignNum: null,
-        assignNumX: null,
-        assignNumJ: null,
-        printDate: null,
-        stockStatus: null,
-        supplierId: null,
-        customerId: null,
-        unit: null,
-        spec: null,
-        spare1: null,
-        spare2: null,
-        spare3: null,
-        spare4: null,
-        spare5: null,
-        spare6: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        stockinGuid: [
-          { required: true, message: "主单GUID不能为空", trigger: "blur" }
-        ],
-        stockinId: [
-          { required: true, message: "主单ID不能为空", trigger: "blur" }
-        ],
-        lotNo: [
-          { required: true, message: "批次号不能为空", trigger: "blur" }
-        ],
-        productId: [
-          { required: true, message: "物料编码不能为空", trigger: "blur" }
-        ],
-      }
-    }
-  },
-  created() {
-    this.getList()
-  },
-  methods: {
-    /** 查询入库单据子表列表 */
-    getList() {
-      this.loading = true
-      listStockInDetail(this.queryParams).then(response => {
-        this.stockInDetailList = response.rows
-        this.total = response.total
-        this.loading = false
-      })
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        stockinDetailId: null,
-        stockinGuid: null,
-        stockinId: null,
-        lotNo: null,
-        productGuid: null,
-        productId: null,
-        quantity: null,
-        quantityX: null,
-        quantityJ: null,
-        price: null,
-        cargoNo: null,
-        remark: null,
-        assignNum: null,
-        assignNumX: null,
-        assignNumJ: null,
-        printDate: null,
-        stockStatus: null,
-        supplierId: null,
-        customerId: null,
-        unit: null,
-        spec: null,
-        spare1: null,
-        spare2: null,
-        spare3: null,
-        spare4: null,
-        spare5: null,
-        spare6: null
-      }
-      this.resetForm("form")
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1
-      this.getList()
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm")
-      this.handleQuery()
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.stockinDetailId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset()
-      this.open = true
-      this.title = "添加入库单据子表"
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset()
-      const stockinDetailId = row.stockinDetailId || this.ids
-      getStockInDetail(stockinDetailId).then(response => {
-        this.form = response.data
-        this.open = true
-        this.title = "修改入库单据子表"
-      })
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.stockinDetailId != null) {
-            updateStockInDetail(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功")
-              this.open = false
-              this.getList()
-            })
-          } else {
-            addStockInDetail(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功")
-              this.open = false
-              this.getList()
-            })
-          }
-        }
-      })
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const stockinDetailIds = row.stockinDetailId || this.ids
-      this.$modal.confirm('是否确认删除入库单据子表编号为"' + stockinDetailIds + '"的数据项？').then(function() {
-        return delStockInDetail(stockinDetailIds)
-      }).then(() => {
-        this.getList()
-        this.$modal.msgSuccess("删除成功")
-      }).catch(() => {})
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('in/stockInDetail/export', {
-        ...this.queryParams
-      }, `stockInDetail_${new Date().getTime()}.xlsx`)
-    }
-  }
-}
-</script>

ruoyi-ui/src/views/receive/stockInDetail/index.vue

@@ -1,521 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-<!--      <el-form-item label="主单GUID" prop="stockinGuid">
-        <el-input
-          v-model="queryParams.stockinGuid"
-          placeholder="请输入主单GUID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="主单ID" prop="stockinId">
-        <el-input
-          v-model="queryParams.stockinId"
-          placeholder="请输入主单ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="批次号" prop="lotNo">
-        <el-input
-          v-model="queryParams.lotNo"
-          placeholder="请输入批次号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="物料ID" prop="productGuid">
-        <el-input
-          v-model="queryParams.productGuid"
-          placeholder="请输入物料ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="物料编码" prop="productId">
-        <el-input
-          v-model="queryParams.productId"
-          placeholder="请输入物料编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="参考单价" prop="price">
-        <el-input
-          v-model="queryParams.price"
-          placeholder="请输入参考单价"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="品牌" prop="cargoNo">
-        <el-input
-          v-model="queryParams.cargoNo"
-          placeholder="请输入品牌"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="入库日期" prop="printDate">
-        <el-input
-          v-model="queryParams.printDate"
-          placeholder="请输入入库日期"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
-      <el-form-item label="供应商编码" prop="supplierId">
-        <el-input
-          v-model="queryParams.supplierId"
-          placeholder="请输入供应商编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="客户编码" prop="customerId">
-        <el-input
-          v-model="queryParams.customerId"
-          placeholder="请输入客户编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-<!--      <el-form-item label="单位" prop="unit">
-        <el-input
-          v-model="queryParams.unit"
-          placeholder="请输入单位"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="规格" prop="spec">
-        <el-input
-          v-model="queryParams.spec"
-          placeholder="请输入规格"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备用字段1" prop="spare1">
-        <el-input
-          v-model="queryParams.spare1"
-          placeholder="请输入备用字段1"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备用字段2" prop="spare2">
-        <el-input
-          v-model="queryParams.spare2"
-          placeholder="请输入备用字段2"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备用字段3" prop="spare3">
-        <el-input
-          v-model="queryParams.spare3"
-          placeholder="请输入备用字段3"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备用字段4" prop="spare4">
-        <el-input
-          v-model="queryParams.spare4"
-          placeholder="请输入备用字段4"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备用字段5" prop="spare5">
-        <el-input
-          v-model="queryParams.spare5"
-          placeholder="请输入备用字段5"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备用字段6" prop="spare6">
-        <el-input
-          v-model="queryParams.spare6"
-          placeholder="请输入备用字段6"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['receive:stockInDetail:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['receive:stockInDetail:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['receive:stockInDetail:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['receive:stockInDetail:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="stockInDetailList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="子单ID" align="center" prop="stockinDetailId" />
-      <el-table-column label="主单GUID" align="center" prop="stockinGuid" />
-      <el-table-column label="主单ID" align="center" prop="stockinId" />
-      <el-table-column label="批次号" align="center" prop="lotNo" />
-      <el-table-column label="物料ID" align="center" prop="productGuid" />
-      <el-table-column label="物料编码" align="center" prop="productId" />
-      <el-table-column label="计划数量" align="center" prop="quantity" />
-      <el-table-column label="计划数量(箱)" align="center" prop="quantityX" />
-      <el-table-column label="计划数量(件)" align="center" prop="quantityJ" />
-      <el-table-column label="参考单价" align="center" prop="price" />
-      <el-table-column label="品牌" align="center" prop="cargoNo" />
-      <el-table-column label="描述" align="center" prop="remark" />
-      <el-table-column label="实际数量" align="center" prop="assignNum" />
-      <el-table-column label="实际数量(箱)" align="center" prop="assignNumX" />
-      <el-table-column label="实际数量(件)" align="center" prop="assignNumJ" />
-      <el-table-column label="入库日期" align="center" prop="printDate" />
-      <el-table-column label="单据状态" align="center" prop="stockStatus" />
-      <el-table-column label="供应商编码" align="center" prop="supplierId" />
-      <el-table-column label="客户编码" align="center" prop="customerId" />
-      <el-table-column label="单位" align="center" prop="unit" />
-      <el-table-column label="规格" align="center" prop="spec" />
-      <el-table-column label="备用字段1" align="center" prop="spare1" />
-      <el-table-column label="备用字段2" align="center" prop="spare2" />
-      <el-table-column label="备用字段3" align="center" prop="spare3" />
-      <el-table-column label="备用字段4" align="center" prop="spare4" />
-      <el-table-column label="备用字段5" align="center" prop="spare5" />
-      <el-table-column label="备用字段6" align="center" prop="spare6" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['receive:stockInDetail:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['receive:stockInDetail:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改收货单据子单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="主单GUID" prop="stockinGuid">
-          <el-input v-model="form.stockinGuid" placeholder="请输入主单GUID" />
-        </el-form-item>
-        <el-form-item label="主单ID" prop="stockinId">
-          <el-input v-model="form.stockinId" placeholder="请输入主单ID" />
-        </el-form-item>
-        <el-form-item label="批次号" prop="lotNo">
-          <el-input v-model="form.lotNo" placeholder="请输入批次号" />
-        </el-form-item>
-        <el-form-item label="物料ID" prop="productGuid">
-          <el-input v-model="form.productGuid" placeholder="请输入物料ID" />
-        </el-form-item>
-        <el-form-item label="物料编码" prop="productId">
-          <el-input v-model="form.productId" placeholder="请输入物料编码" />
-        </el-form-item>
-        <el-form-item label="参考单价" prop="price">
-          <el-input v-model="form.price" placeholder="请输入参考单价" />
-        </el-form-item>
-        <el-form-item label="品牌" prop="cargoNo">
-          <el-input v-model="form.cargoNo" placeholder="请输入品牌" />
-        </el-form-item>
-        <el-form-item label="描述" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入描述" />
-        </el-form-item>
-        <el-form-item label="入库日期" prop="printDate">
-          <el-input v-model="form.printDate" placeholder="请输入入库日期" />
-        </el-form-item>
-        <el-form-item label="供应商编码" prop="supplierId">
-          <el-input v-model="form.supplierId" placeholder="请输入供应商编码" />
-        </el-form-item>
-        <el-form-item label="客户编码" prop="customerId">
-          <el-input v-model="form.customerId" placeholder="请输入客户编码" />
-        </el-form-item>
-        <el-form-item label="单位" prop="unit">
-          <el-input v-model="form.unit" placeholder="请输入单位" />
-        </el-form-item>
-        <el-form-item label="规格" prop="spec">
-          <el-input v-model="form.spec" placeholder="请输入规格" />
-        </el-form-item>
-        <el-form-item label="备用字段1" prop="spare1">
-          <el-input v-model="form.spare1" placeholder="请输入备用字段1" />
-        </el-form-item>
-        <el-form-item label="备用字段2" prop="spare2">
-          <el-input v-model="form.spare2" placeholder="请输入备用字段2" />
-        </el-form-item>
-        <el-form-item label="备用字段3" prop="spare3">
-          <el-input v-model="form.spare3" placeholder="请输入备用字段3" />
-        </el-form-item>
-        <el-form-item label="备用字段4" prop="spare4">
-          <el-input v-model="form.spare4" placeholder="请输入备用字段4" />
-        </el-form-item>
-        <el-form-item label="备用字段5" prop="spare5">
-          <el-input v-model="form.spare5" placeholder="请输入备用字段5" />
-        </el-form-item>
-        <el-form-item label="备用字段6" prop="spare6">
-          <el-input v-model="form.spare6" placeholder="请输入备用字段6" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listStockInDetail, getStockInDetail, delStockInDetail, addStockInDetail, updateStockInDetail } from "@/api/receive/stockInDetail"
-
-export default {
-  name: "StockInDetail",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 收货单据子单表格数据
-      stockInDetailList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        stockinGuid: null,
-        stockinId: null,
-        lotNo: null,
-        productGuid: null,
-        productId: null,
-        quantity: null,
-        quantityX: null,
-        quantityJ: null,
-        price: null,
-        cargoNo: null,
-        assignNum: null,
-        assignNumX: null,
-        assignNumJ: null,
-        printDate: null,
-        stockStatus: null,
-        supplierId: null,
-        customerId: null,
-        unit: null,
-        spec: null,
-        spare1: null,
-        spare2: null,
-        spare3: null,
-        spare4: null,
-        spare5: null,
-        spare6: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        stockinGuid: [
-          { required: true, message: "主单GUID不能为空", trigger: "blur" }
-        ],
-        stockinId: [
-          { required: true, message: "主单ID不能为空", trigger: "blur" }
-        ],
-        lotNo: [
-          { required: true, message: "批次号不能为空", trigger: "blur" }
-        ],
-        productId: [
-          { required: true, message: "物料编码不能为空", trigger: "blur" }
-        ],
-      }
-    }
-  },
-  created() {
-    this.getList()
-  },
-  methods: {
-    /** 查询收货单据子单列表 */
-    getList() {
-      this.loading = true
-      listStockInDetail(this.queryParams).then(response => {
-        this.stockInDetailList = response.rows
-        this.total = response.total
-        this.loading = false
-      })
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        stockinDetailId: null,
-        stockinGuid: null,
-        stockinId: null,
-        lotNo: null,
-        productGuid: null,
-        productId: null,
-        quantity: null,
-        quantityX: null,
-        quantityJ: null,
-        price: null,
-        cargoNo: null,
-        remark: null,
-        assignNum: null,
-        assignNumX: null,
-        assignNumJ: null,
-        printDate: null,
-        stockStatus: null,
-        supplierId: null,
-        customerId: null,
-        unit: null,
-        spec: null,
-        spare1: null,
-        spare2: null,
-        spare3: null,
-        spare4: null,
-        spare5: null,
-        spare6: null
-      }
-      this.resetForm("form")
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1
-      this.getList()
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm")
-      this.handleQuery()
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.stockinDetailId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset()
-      this.open = true
-      this.title = "添加收货单据子单"
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset()
-      const stockinDetailId = row.stockinDetailId || this.ids
-      getStockInDetail(stockinDetailId).then(response => {
-        this.form = response.data
-        this.open = true
-        this.title = "修改收货单据子单"
-      })
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.stockinDetailId != null) {
-            updateStockInDetail(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功")
-              this.open = false
-              this.getList()
-            })
-          } else {
-            addStockInDetail(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功")
-              this.open = false
-              this.getList()
-            })
-          }
-        }
-      })
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const stockinDetailIds = row.stockinDetailId || this.ids
-      this.$modal.confirm('是否确认删除收货单据子单编号为"' + stockinDetailIds + '"的数据项？').then(function() {
-        return delStockInDetail(stockinDetailIds)
-      }).then(() => {
-        this.getList()
-        this.$modal.msgSuccess("删除成功")
-      }).catch(() => {})
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('receive/stockInDetail/export', {
-        ...this.queryParams
-      }, `stockInDetail_${new Date().getTime()}.xlsx`)
-    }
-  }
-}
-</script>

ruoyi-ui/src/views/receive/stockin/add/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <div class="form-container">
+    <div>
-      <div class="form-header">
+      <div class="page-header">
         <span>新增入库单</span>
       </div>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
@@ -44,8 +44,8 @@
       </el-form>
     </div>
 
-    <div class="product-container">
+    <div class="mt-3">
-      <div class="product-header">
+      <div class="page-header">
         <span>入库物料</span>
         <el-row>
           <el-col :span="1.5">
@@ -78,9 +78,8 @@
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.lotNo"
-              :min="1"
               controls-position="right"
-              @change="calculateTotal"
+              required="required"
             />
           </template>
         </el-table-column>
@@ -90,6 +89,7 @@
               v-model="scope.row.quantity"
               :min="1"
               controls-position="right"
+              required="required"
               @change="calculateTotal"
             />
           </template>
@@ -339,6 +339,11 @@ export default {
             this.$modal.msgError("请添加入库物料");
             return;
           }
+          //校验lotNo productGuid quantity 不能为空
+          if (this.productList.some(item => !item.lotNo || !item.productGuid || !item.quantity)) {
+            this.$modal.msgError("请填写正确的物料信息");
+            return;
+          }
 
           // 构建请求数据
           const data = {
@@ -395,7 +400,7 @@ export default {
       this.upload.open = false
       this.upload.isUploading = false
       this.$refs.upload.clearFiles()
-      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true })
+      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", {dangerouslyUseHTMLString: true});
       if (response.code === 200) {
         this.$modal.msgSuccess("导入成功");
         this.productList.push(...response.data)
@@ -415,29 +420,7 @@ export default {
 </script>
 
 <style scoped>
-.form-container {
+.page-header {
-  background-color: #fff;
-  padding: 20px;
-  margin-bottom: 10px;
-  border: 1px solid #dcdfe6;
-  border-radius: 4px;
-}
-
-.form-header {
-  padding-bottom: 15px;
-  border-bottom: 1px solid #dcdfe6;
-  margin-bottom: 15px;
-}
-
-.product-container {
-  background-color: #fff;
-  padding: 20px;
-  margin-top: 10px;
-  border: 1px solid #dcdfe6;
-  border-radius: 4px;
-}
-
-.product-header {
   padding-bottom: 15px;
   border-bottom: 1px solid #dcdfe6;
   margin-bottom: 15px;
@@ -446,6 +429,10 @@ export default {
   align-items: center;
 }
 
+.mt-3 {
+  margin-top: 1rem;
+}
+
 .total-info span {
   font-size: 16px;
   font-weight: bold;

ruoyi-ui/src/views/receive/stockin/index.vue

@@ -1,117 +1,112 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-<!--      <el-form-item label="入库订单ID" prop="stockinId">
+      <!--      <el-form-item label="入库订单ID" prop="stockinId">
-        <el-input
+              <el-input
-          v-model="queryParams.stockinId"
+                v-model="queryParams.stockinId"
-          placeholder="请输入入库订单ID"
+                placeholder="请输入入库订单ID"
-          clearable
+                clearable
-          @keyup.enter.native="handleQuery"
+                @keyup.enter.native="handleQuery"
-        />
+              />
-      </el-form-item>
+            </el-form-item>
-      <el-form-item label="建立时间" prop="createDate">
+            <el-form-item label="建立时间" prop="createDate">
-        <el-input
+              <el-input
-          v-model="queryParams.createDate"
+                v-model="queryParams.createDate"
-          placeholder="请输入建立时间"
+                placeholder="请输入建立时间"
-          clearable
+                clearable
-          @keyup.enter.native="handleQuery"
+                @keyup.enter.native="handleQuery"
-        />
+              />
-      </el-form-item>
+            </el-form-item>
-      <el-form-item label="创建人" prop="createManId">
+            <el-form-item label="创建人" prop="createManId">
-        <el-input
+              <el-input
-          v-model="queryParams.createManId"
+                v-model="queryParams.createManId"
-          placeholder="请输入创建人"
+                placeholder="请输入创建人"
-          clearable
+                clearable
-          @keyup.enter.native="handleQuery"
+                @keyup.enter.native="handleQuery"
-        />
+              />
-      </el-form-item>-->
+            </el-form-item>-->
-<!--      <el-form-item label="仓库ID" prop="warehouseId">
+      <!--
-        <el-input
+            </el-form-item>
-          v-model="queryParams.warehouseId"
+            <el-form-item label="备用字段5" prop="spare5">
-          placeholder="请输入仓库ID"
+              <el-input
-          clearable
+                v-model="queryParams.spare5"
-          @keyup.enter.native="handleQuery"
+                placeholder="请输入备用字段5"
-        />
+                clearable
-      </el-form-item>
+                @keyup.enter.native="handleQuery"
-      <el-form-item label="备用字段5" prop="spare5">
+              />
-        <el-input
+            </el-form-item>
-          v-model="queryParams.spare5"
+            <el-form-item label="备用字段4" prop="spare4">
-          placeholder="请输入备用字段5"
+              <el-input
-          clearable
+                v-model="queryParams.spare4"
-          @keyup.enter.native="handleQuery"
+                placeholder="请输入备用字段4"
-        />
+                clearable
-      </el-form-item>
+                @keyup.enter.native="handleQuery"
-      <el-form-item label="备用字段4" prop="spare4">
+              />
-        <el-input
+            </el-form-item>
-          v-model="queryParams.spare4"
+            <el-form-item label="备用字段3" prop="spare3">
-          placeholder="请输入备用字段4"
+              <el-input
-          clearable
+                v-model="queryParams.spare3"
-          @keyup.enter.native="handleQuery"
+                placeholder="请输入备用字段3"
-        />
+                clearable
-      </el-form-item>
+                @keyup.enter.native="handleQuery"
-      <el-form-item label="备用字段3" prop="spare3">
+              />
-        <el-input
+            </el-form-item>
-          v-model="queryParams.spare3"
+            <el-form-item label=" 完成日期" prop="finishDate">
-          placeholder="请输入备用字段3"
+              <el-input
-          clearable
+                v-model="queryParams.finishDate"
-          @keyup.enter.native="handleQuery"
+                placeholder="请输入 完成日期"
-        />
+                clearable
-      </el-form-item>
+                @keyup.enter.native="handleQuery"
-      <el-form-item label=" 完成日期" prop="finishDate">
+              />
-        <el-input
+            </el-form-item>
-          v-model="queryParams.finishDate"
+            <el-form-item label="备用字段2" prop="spare2">
-          placeholder="请输入 完成日期"
+              <el-input
-          clearable
+                v-model="queryParams.spare2"
-          @keyup.enter.native="handleQuery"
+                placeholder="请输入备用字段2"
-        />
+                clearable
-      </el-form-item>
+                @keyup.enter.native="handleQuery"
-      <el-form-item label="备用字段2" prop="spare2">
+              />
-        <el-input
+            </el-form-item>
-          v-model="queryParams.spare2"
+            <el-form-item label="备用字段1" prop="spare1">
-          placeholder="请输入备用字段2"
+              <el-input
-          clearable
+                v-model="queryParams.spare1"
-          @keyup.enter.native="handleQuery"
+                placeholder="请输入备用字段1"
-        />
+                clearable
-      </el-form-item>
+                @keyup.enter.native="handleQuery"
-      <el-form-item label="备用字段1" prop="spare1">
+              />
-        <el-input
+            </el-form-item>
-          v-model="queryParams.spare1"
+            <el-form-item label="erp单号" prop="erpBill">
-          placeholder="请输入备用字段1"
+              <el-input
-          clearable
+                v-model="queryParams.erpBill"
-          @keyup.enter.native="handleQuery"
+                placeholder="请输入erp单号"
-        />
+                clearable
-      </el-form-item>
+                @keyup.enter.native="handleQuery"
-      <el-form-item label="erp单号" prop="erpBill">
+              />
-        <el-input
+            </el-form-item>
-          v-model="queryParams.erpBill"
+            -->
-          placeholder="请输入erp单号"
+<!--      <el-form-item label="客户编码" prop="customerNo">
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单据来源" prop="stockSource">
-        <el-input
-          v-model="queryParams.stockSource"
-          placeholder="请输入单据来源"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
-      <el-form-item label="客户编码" prop="customerNo">
         <el-input
           v-model="queryParams.customerNo"
           placeholder="请输入客户编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
-      <el-form-item label="班组编码" prop="classNo">
+<!--      <el-form-item label="班组编码" prop="classNo">
         <el-input
           v-model="queryParams.classNo"
           placeholder="请输入班组编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
+      </el-form-item>-->
+      <el-form-item label="入库订单ID" prop="stockinId">
+        <el-input
+          v-model="queryParams.stockinId"
+          placeholder="请输入入库订单ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="供应商编码" prop="supplierNo">
         <el-input
@@ -121,6 +116,22 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="单据来源" prop="stockSource">
+        <el-input
+          v-model="queryParams.stockSource"
+          placeholder="请输入单据来源"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="仓库" prop="warehouseId">
+        <el-input
+          v-model="queryParams.warehouseId"
+          placeholder="请输入仓库"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -128,16 +139,16 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-<!--      <el-col :span="1.5">
+      <!--      <el-col :span="1.5">
-        <el-button
+              <el-button
-          type="primary"
+                type="primary"
-          plain
+                plain
-          icon="el-icon-plus"
+                icon="el-icon-plus"
-          size="mini"
+                size="mini"
-          @click="handleAdd"
+                @click="handleAdd"
-          v-hasPermi="['receive:stockin:add']"
+                v-hasPermi="['receive:stockin:add']"
-        >新增</el-button>
+              >新增</el-button>
-      </el-col>-->
+            </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -145,9 +156,10 @@
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
-          @click="handleUpdate"
+          @click="handleCreateInStockIn"
           v-hasPermi="['receive:stockin:edit']"
-        >修改</el-button>
+        >生成入库单据
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -158,7 +170,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['receive:stockin:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -168,33 +181,35 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['receive:stockin:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="stockinList" @selection-change="handleSelectionChange" @row-click="handleRowClick">
+    <el-table v-loading="loading" :data="stockinList" @selection-change="handleSelectionChange"
-      <el-table-column type="selection" width="55" align="center" />
+              @row-click="handleRowClick">
-      <el-table-column label="GUID" align="center" prop="stockinGuid" />
+      <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="入库订单ID" align="center" prop="stockinId" />
+      <!-- <el-table-column label="GUID" align="center" prop="stockinGuid" /> -->
-      <el-table-column label="入库类型" align="center" prop="inType" />
+      <el-table-column label="入库订单ID" align="center" prop="stockinId"/>
-      <el-table-column label="建立时间" align="center" prop="createDate" />
+      <el-table-column label="入库类型" align="center" prop="inType"/>
-      <el-table-column label="创建人" align="center" prop="createManId" />
+      <el-table-column label="建立时间" align="center" prop="createDate"/>
-      <el-table-column label="单据状态" align="center" prop="status" />
+      <el-table-column label="创建人" align="center" prop="createManId"/>
-      <el-table-column label="仓库ID" align="center" prop="warehouseId" />
+      <el-table-column label="单据状态" align="center" prop="status"/>
-      <el-table-column label="备用字段5" align="center" prop="spare5" />
+      <el-table-column label="仓库ID" align="center" prop="warehouseId"/>
-      <el-table-column label="备用字段4" align="center" prop="spare4" />
+      <!--      <el-table-column label="备用字段5" align="center" prop="spare5" />
-      <el-table-column label="备用字段3" align="center" prop="spare3" />
+            <el-table-column label="备用字段4" align="center" prop="spare4" />
-      <el-table-column label=" 完成日期" align="center" prop="finishDate" />
+            <el-table-column label="备用字段3" align="center" prop="spare3" />-->
-      <el-table-column label="备用字段2" align="center" prop="spare2" />
+      <el-table-column label=" 完成日期" align="center" prop="finishDate"/>
-      <el-table-column label="备用字段1" align="center" prop="spare1" />
+      <!--      <el-table-column label="备用字段2" align="center" prop="spare2" />
-      <el-table-column label="erp单号" align="center" prop="erpBill" />
+            <el-table-column label="备用字段1" align="center" prop="spare1" />-->
-      <el-table-column label="单据来源" align="center" prop="stockSource" />
+      <el-table-column label="erp单号" align="center" prop="erpBill"/>
-      <el-table-column label="部门编码" align="center" prop="departmentNo" />
+      <el-table-column label="单据来源" align="center" prop="stockSource"/>
-      <el-table-column label="客户编码" align="center" prop="customerNo" />
+      <el-table-column label="部门编码" align="center" prop="departmentNo"/>
-      <el-table-column label="班组编码" align="center" prop="classNo" />
+      <el-table-column label="客户编码" align="center" prop="customerNo"/>
-      <el-table-column label="供应商编码" align="center" prop="supplierNo" />
+      <el-table-column label="班组编码" align="center" prop="classNo"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="供应商编码" align="center" prop="supplierNo"/>
+      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -202,7 +217,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['receive:stockin:edit']"
-          >修改</el-button>
+          >质检</el-button>
           <el-button
             size="mini"
             type="text"
@@ -211,7 +226,7 @@
             v-hasPermi="['receive:stockin:remove']"
           >删除</el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination
@@ -221,52 +236,88 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
+    <el-row :gutter="10" class="mb8">
-    <el-table v-loading="detailLoading" :data="stockInDetailList" @selection-change="handleSelectionChange">
+      <el-col :span="1.5">
-      <el-table-column type="selection" width="55" align="center" />
+        <el-button
-      <el-table-column label="子单ID" align="center" prop="stockinDetailId" />
+          type="success"
-      <el-table-column label="主单GUID" align="center" prop="stockinGuid" />
+          plain
-      <el-table-column label="主单ID" align="center" prop="stockinId" />
+          icon="el-icon-edit"
-      <el-table-column label="批次号" align="center" prop="lotNo" />
+          size="mini"
-      <el-table-column label="物料ID" align="center" prop="productGuid" />
+          :detailDisabled="single"
-      <el-table-column label="物料编码" align="center" prop="productId" />
+          @click="handleQualityInspection"
-      <el-table-column label="计划数量" align="center" prop="quantity" />
+          v-hasPermi="['receive:stockin:edit']"
-      <el-table-column label="计划数量(箱)" align="center" prop="quantityX" />
+        >质检
-      <el-table-column label="计划数量(件)" align="center" prop="quantityJ" />
+        </el-button>
-      <el-table-column label="参考单价" align="center" prop="price" />
+      </el-col>
-      <el-table-column label="品牌" align="center" prop="cargoNo" />
+      <el-col :span="1.5">
-      <el-table-column label="描述" align="center" prop="remark" />
+        <el-button
-      <el-table-column label="实际数量" align="center" prop="assignNum" />
+          type="danger"
-      <el-table-column label="实际数量(箱)" align="center" prop="assignNumX" />
+          plain
-      <el-table-column label="实际数量(件)" align="center" prop="assignNumJ" />
+          icon="el-icon-delete"
-      <el-table-column label="入库日期" align="center" prop="printDate" />
+          size="mini"
-      <el-table-column label="单据状态" align="center" prop="stockStatus" />
+          :detailDisabled="multiple"
-      <el-table-column label="供应商编码" align="center" prop="supplierId" />
+          @click="handleStockinDetailDelete"
-      <el-table-column label="客户编码" align="center" prop="customerId" />
+          v-hasPermi="['receive:stockin:remove']"
-      <el-table-column label="单位" align="center" prop="unit" />
+        >删除
-      <el-table-column label="规格" align="center" prop="spec" />
+        </el-button>
-      <el-table-column label="备用字段1" align="center" prop="spare1" />
+      </el-col>
-      <el-table-column label="备用字段2" align="center" prop="spare2" />
+    </el-row>
-      <el-table-column label="备用字段3" align="center" prop="spare3" />
+    <el-table v-loading="detailLoading" :data="stockInDetailList" @selection-change="handleDetailSelectionChange">
-      <el-table-column label="备用字段4" align="center" prop="spare4" />
+      <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="备用字段5" align="center" prop="spare5" />
+      <el-table-column label="子单ID" align="center" prop="stockinDetailId"/>
-      <el-table-column label="备用字段6" align="center" prop="spare6" />
+      <!-- <el-table-column label="主单GUID" align="center" prop="stockinGuid" /> -->
+      <el-table-column label="主单ID" align="center" prop="stockinId"/>
+      <el-table-column label="批次号" align="center" prop="lotNo"/>
+      <el-table-column label="物料ID" align="center" prop="productGuid"/>
+      <el-table-column label="物料编码" align="center" prop="productId"/>
+      <el-table-column label="计划数量" width="120" align="center">
+        <template slot-scope="scope">
+          <el-input-number
+            v-model="scope.row.quantity"
+            :min="1"
+            controls-position="right"
+            required="required"
+          />
+        </template>
+      </el-table-column>
+      <!--      <el-table-column label="计划数量(箱)" align="center" prop="quantityX" />
+            <el-table-column label="计划数量(件)" align="center" prop="quantityJ" />-->
+      <el-table-column label="参考单价" align="center" prop="price"/>
+      <el-table-column label="品牌" align="center" prop="cargoNo"/>
+      <el-table-column label="描述" align="center" prop="remark"/>
+      <!--      <el-table-column label="实际数量" align="center" prop="assignNum" />
+            <el-table-column label="实际数量(箱)" align="center" prop="assignNumX" />
+            <el-table-column label="实际数量(件)" align="center" prop="assignNumJ" />-->
+      <el-table-column label="入库日期" align="center" prop="printDate"/>
+      <el-table-column label="单据状态" align="center" prop="stockStatus"/>
+      <el-table-column label="供应商编码" align="center" prop="supplierId"/>
+      <el-table-column label="客户编码" align="center" prop="customerId"/>
+      <el-table-column label="单位" align="center" prop="unit"/>
+      <el-table-column label="规格" align="center" prop="spec"/>
+      <!--      <el-table-column label="备用字段1" align="center" prop="spare1" />
+            <el-table-column label="备用字段2" align="center" prop="spare2" />
+            <el-table-column label="备用字段3" align="center" prop="spare3" />
+            <el-table-column label="备用字段4" align="center" prop="spare4" />
+            <el-table-column label="备用字段5" align="center" prop="spare5" />
+            <el-table-column label="备用字段6" align="center" prop="spare6" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
+            @click="handleQualityInspection(scope.row)"
             v-hasPermi="['receive:stockInDetail:edit']"
-          >修改</el-button>
+          >质检
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
+            @click="handleStockinDetailDelete(scope.row)"
             v-hasPermi="['receive:stockInDetail:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -280,68 +331,68 @@
     />
 
     <!-- 添加或修改收货单据对话框 -->
-<!--    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <!--    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+          <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="入库订单ID" prop="stockinId">
+            <el-form-item label="入库订单ID" prop="stockinId">
-          <el-input v-model="form.stockinId" placeholder="请输入入库订单ID" />
+              <el-input v-model="form.stockinId" placeholder="请输入入库订单ID" />
-        </el-form-item>
+            </el-form-item>
-        <el-form-item label="建立时间" prop="createDate">
+            <el-form-item label="建立时间" prop="createDate">
-          <el-input v-model="form.createDate" placeholder="请输入建立时间" />
+              <el-input v-model="form.createDate" placeholder="请输入建立时间" />
-        </el-form-item>
+            </el-form-item>
-        <el-form-item label="创建人" prop="createManId">
+            <el-form-item label="创建人" prop="createManId">
-          <el-input v-model="form.createManId" placeholder="请输入创建人" />
+              <el-input v-model="form.createManId" placeholder="请输入创建人" />
-        </el-form-item>
+            </el-form-item>
-        <el-form-item label="仓库ID" prop="warehouseId">
+            <el-form-item label="仓库ID" prop="warehouseId">
-          <el-input v-model="form.warehouseId" placeholder="请输入仓库ID" />
+              <el-input v-model="form.warehouseId" placeholder="请输入仓库ID" />
-        </el-form-item>
+            </el-form-item>
-        <el-form-item label="备用字段5" prop="spare5">
+            <el-form-item label="备用字段5" prop="spare5">
-          <el-input v-model="form.spare5" placeholder="请输入备用字段5" />
+              <el-input v-model="form.spare5" placeholder="请输入备用字段5" />
-        </el-form-item>
+            </el-form-item>
-        <el-form-item label="备用字段4" prop="spare4">
+            <el-form-item label="备用字段4" prop="spare4">
-          <el-input v-model="form.spare4" placeholder="请输入备用字段4" />
+              <el-input v-model="form.spare4" placeholder="请输入备用字段4" />
-        </el-form-item>
+            </el-form-item>
-        <el-form-item label="备用字段3" prop="spare3">
+            <el-form-item label="备用字段3" prop="spare3">
-          <el-input v-model="form.spare3" placeholder="请输入备用字段3" />
+              <el-input v-model="form.spare3" placeholder="请输入备用字段3" />
-        </el-form-item>
+            </el-form-item>
-        <el-form-item label=" 完成日期" prop="finishDate">
+            <el-form-item label=" 完成日期" prop="finishDate">
-          <el-input v-model="form.finishDate" placeholder="请输入 完成日期" />
+              <el-input v-model="form.finishDate" placeholder="请输入 完成日期" />
-        </el-form-item>
+            </el-form-item>
-        <el-form-item label="备用字段2" prop="spare2">
+            <el-form-item label="备用字段2" prop="spare2">
-          <el-input v-model="form.spare2" placeholder="请输入备用字段2" />
+              <el-input v-model="form.spare2" placeholder="请输入备用字段2" />
-        </el-form-item>
+            </el-form-item>
-        <el-form-item label="备用字段1" prop="spare1">
+            <el-form-item label="备用字段1" prop="spare1">
-          <el-input v-model="form.spare1" placeholder="请输入备用字段1" />
+              <el-input v-model="form.spare1" placeholder="请输入备用字段1" />
-        </el-form-item>
+            </el-form-item>
-        <el-form-item label="erp单号" prop="erpBill">
+            <el-form-item label="erp单号" prop="erpBill">
-          <el-input v-model="form.erpBill" placeholder="请输入erp单号" />
+              <el-input v-model="form.erpBill" placeholder="请输入erp单号" />
-        </el-form-item>
+            </el-form-item>
-        <el-form-item label="单据来源" prop="stockSource">
+            <el-form-item label="单据来源" prop="stockSource">
-          <el-input v-model="form.stockSource" placeholder="请输入单据来源" />
+              <el-input v-model="form.stockSource" placeholder="请输入单据来源" />
-        </el-form-item>
+            </el-form-item>
-        <el-form-item label="部门编码" prop="departmentNo">
+            <el-form-item label="部门编码" prop="departmentNo">
-          <el-input v-model="form.departmentNo" type="textarea" placeholder="请输入内容" />
+              <el-input v-model="form.departmentNo" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
+            </el-form-item>
-        <el-form-item label="客户编码" prop="customerNo">
+            <el-form-item label="客户编码" prop="customerNo">
-          <el-input v-model="form.customerNo" placeholder="请输入客户编码" />
+              <el-input v-model="form.customerNo" placeholder="请输入客户编码" />
-        </el-form-item>
+            </el-form-item>
-        <el-form-item label="班组编码" prop="classNo">
+            <el-form-item label="班组编码" prop="classNo">
-          <el-input v-model="form.classNo" placeholder="请输入班组编码" />
+              <el-input v-model="form.classNo" placeholder="请输入班组编码" />
-        </el-form-item>
+            </el-form-item>
-        <el-form-item label="供应商编码" prop="supplierNo">
+            <el-form-item label="供应商编码" prop="supplierNo">
-          <el-input v-model="form.supplierNo" placeholder="请输入供应商编码" />
+              <el-input v-model="form.supplierNo" placeholder="请输入供应商编码" />
-        </el-form-item>
+            </el-form-item>
-      </el-form>
+          </el-form>
-      <div slot="footer" class="dialog-footer">
+          <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+            <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+            <el-button @click="cancel">取 消</el-button>
-      </div>
+          </div>
-    </el-dialog>-->
+        </el-dialog>-->
   </div>
 </template>
 
 <script>
-import { listStockin, getStockin, delStockin, addStockin, updateStockin } from "@/api/receive/stockin"
+import {listStockin, getStockin, delStockin, addStockin, updateStockin, createStockin} from "@/api/receive/stockin"
-import { listStockInDetail } from "@/api/receive/stockInDetail"
+import {listStockInDetail, delStockInDetail,qualityInspection} from "@/api/receive/stockInDetail"
 
 export default {
   name: "Stockin",
@@ -352,10 +403,13 @@ export default {
       detailLoading: true,
       // 选中数组
       ids: [],
+      detailIds: [], // 子表格选中数组
       // 非单个禁用
       single: true,
+      detailSingle: true, // 子表格非单个禁用
       // 非多个禁用
       multiple: true,
+      detailMultiple: true, // 子表格非多个禁用
       // 显示搜索条件
       showSearch: true,
       // 总条数
@@ -390,26 +444,26 @@ export default {
         classNo: null,
         supplierNo: null
       },
-      queryDetailParams:{
+      queryDetailParams: {
         pageNum: 1,
         pageSize: 10,
-        stockinId:null
+        stockinId: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         stockinId: [
-          { required: true, message: "入库订单ID不能为空", trigger: "blur" }
+          {required: true, message: "入库订单ID不能为空", trigger: "blur"}
         ],
         inType: [
-          { required: true, message: "入库类型不能为空", trigger: "change" }
+          {required: true, message: "入库类型不能为空", trigger: "change"}
         ],
         createDate: [
-          { required: true, message: "建立时间不能为空", trigger: "blur" }
+          {required: true, message: "建立时间不能为空", trigger: "blur"}
         ],
         status: [
-          { required: true, message: "单据状态不能为空", trigger: "change" }
+          {required: true, message: "单据状态不能为空", trigger: "change"}
         ],
       }
     }
@@ -425,12 +479,12 @@ export default {
         this.stockinList = response.rows
         this.total = response.total
         this.loading = false
-        var length =  this.stockinList.length;
+        var length = this.stockinList.length;
-        if (length > 0){
+        if (length > 0) {
-          var data = this.stockInList.at(0);
+          var data = this.stockinList[0];
           this.getDetailList(data.stockinId);
-        }else {
+        } else {
-          console.log("没有数据")
+          //console.log("没有数据")
           this.stockInDetailList = []
           this.detailLoading = false
         }
@@ -480,23 +534,28 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.stockinGuid)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
-    /** 新增按钮操作 */
+    // 子表格多选框选中数据
-    handleAdd() {
+    handleDetailSelectionChange(selection) {
-      this.reset()
+      this.detailIds = selection.map(item => item.stockinDetailId)
-      this.open = true
+      this.detailSingle = selection.length !== 1
-      this.title = "添加收货单据"
+      this.detailMultiple = !selection.length
     },
-    /** 修改按钮操作 */
+    /**
-    handleUpdate(row) {
+     * 创建入库单
+     * @param row
+     */
+    handleCreateInStockIn(row) {
       this.reset()
       const stockinGuid = row.stockinGuid || this.ids
-      getStockin(stockinGuid).then(response => {
+      let data = {
-        this.form = response.data
+        stockinGuidList: stockinGuid
-        this.open = true
+      }
-        this.title = "修改收货单据"
+      console.log(data)
+      createStockin(data).then(response => {
+        this.getList()
       })
     },
     /** 提交按钮 */
@@ -522,12 +581,13 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const stockinGuids = row.stockinGuid || this.ids
-      this.$modal.confirm('是否确认删除收货单据编号为"' + stockinGuids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除收货单据编号为"' + stockinGuids + '"的数据项？').then(function () {
         return delStockin(stockinGuids)
       }).then(() => {
         this.getList()
         this.$modal.msgSuccess("删除成功")
-      }).catch(() => {})
+      }).catch(() => {
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -535,6 +595,7 @@ export default {
         ...this.queryParams
       }, `stockin_${new Date().getTime()}.xlsx`)
     },
+    /** 获取子单据列表 */
     getDetailList(stockinId) {
       this.detailLoading = true;
       this.queryDetailParams.stockinId = stockinId;
@@ -544,7 +605,7 @@ export default {
         this.detailLoading = false;
       });
     },
-    handleRowClick(selection){
+    handleRowClick(selection) {
       this.detailLoading = true;
       this.queryDetailParams.stockinId = selection.stockinId;
       listStockInDetail(this.queryDetailParams).then(response => {
@@ -552,6 +613,41 @@ export default {
         this.detailTotal = response.total;
         this.detailLoading = false;
       });
+    },
+    handleStockinDetailDelete(row) {
+      const stockinDetailIds = row.stockinDetailId || this.detailIds
+
+      this.$modal.confirm('是否确认删除收货子单据编号为"' + stockinDetailIds + '"的数据项？').then(function () {
+        return delStockInDetail(stockinDetailIds)
+      }).then(() => {
+        this.getDetailList(this.queryDetailParams.stockinId)
+        this.$modal.msgSuccess("删除成功")
+      }).catch(() => {
+      })
+    },
+    handleQualityInspection(row) {
+
+      const stockinDetailIds = row.stockinDetailId || this.detailIds
+
+      let selectedDetails = [];
+      // 如果是点击批量质检按钮，获取所有选中行的数据
+      selectedDetails = this.stockInDetailList.filter(item =>
+      stockinDetailIds.includes(item.stockinDetailId)
+        ).map(item => ({
+          stockinDetailId: item.stockinDetailId,
+          quantity: item.quantity,
+          stockinId: item.stockinId
+        }));
+
+      let data = {
+        list: selectedDetails,
+        stockinId: selectedDetails[0].stockinId
+      };
+      console.log(data);
+      qualityInspection(data).then(response => {
+        this.getDetailList(data.stockinId)
+        this.$modal.msgSuccess("质检成功");
+      });
     }
   }
 }