入库管理页面修改

ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/vo/InstockInVo.java

@@ -27,6 +27,9 @@ public class InstockInVo {
     @NotNull
     private String erpBill;
 
+    @NotNull
+    private String productType;
+
 
     private List<BasProduct> productVoList;
 

ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java

@@ -108,6 +108,7 @@ public class InStockinServiceImpl implements IInStockinService
         inStockin.setWarehouseId(inStockinVo.getWarehouseId());
         inStockin.setStatus("1");
         inStockin.setStockSource("1");
+        inStockin.setSpare1(inStockinVo.getProductType());
         inStockinMapper.insertInStockin(inStockin);
         for (int i = 1; i <= productVoList.size(); i++) {
             BasProduct basProduct = productVoList.get(i-1);

ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java

@@ -323,6 +323,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
                     //正常库存
                     BasStock stockByInStockinDetail = getStockByInStockinDetail(mydoJobDetail, mydoJob, "1");
                     stockByInStockinDetail.setSpare7("0");
+
                     list.add(stockByInStockinDetail);
                 }
 

ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java

@@ -111,6 +111,8 @@ public class MydoJobDetail extends BaseEntity
     /** 供应商ID */
     @Excel(name = "供应商ID")
     private String supplierId;
+    @Excel(name = "供应商")
+    private String supplierName;
 
     /** 备用字段1 */
     @Excel(name = "型号")