入库管理页面修改

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 = "型号")

ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml

@@ -40,6 +40,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="spec"    column="spec"    />
         <result property="unit"    column="unit"    />
         <result property="productName"    column="product_name"    />
+        <result property="supplierName"    column="supplier_name"    />
+
     </resultMap>
 
 
@@ -146,9 +148,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                mjd.spare8,
                mjd.spare9,
                mjd.spec,
-               mjd.unit
+               mjd.unit,
+               bs.supplier_name
         from mydo_job_detail_finish mjd
                  left join bas_product bp on mjd.product_id = bp.product_id
+        left join bas_supplier bs on mjd.supplier_id = bs.supplier_no
         where job_id = #{jobId}
     </select>
 

ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml

@@ -42,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="unit"    column="unit"    />
         <result property="productName"    column="product_name"    />
         <result property="trayCode"    column="tray_code"    />
+        <result property="supplierName"    column="supplier_name"    />
     </resultMap>
 
     <select id="selectMydoJobDetailList" parameterType="MydoJobDetail" resultMap="MydoJobDetailResult">
@@ -80,10 +81,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         mjd.spare8,
         mjd.spare9,
         mjd.spec,
-        mjd.unit
+        mjd.unit,
+        bs.supplier_name
 
         from mydo_job_detail mjd
         left join bas_product bp on mjd.product_id = bp.product_id
+        left join bas_supplier bs on mjd.supplier_id = bs.supplier_no
         <where>
             <if test="jobDetailId != null and jobDetailId != ''"> and mjd.job_detail_id = #{jobDetailId}</if>
             <if test="jobId != null and jobId != ''"> and mjd.job_id = #{jobId}</if>