Merge remote-tracking branch 'origin/master'

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsHppInStockDetailVo.java

@@ -46,6 +46,7 @@ public class WmsHppInStockDetailVo implements Serializable {
      */
     @ExcelProperty(value = "工装架子号")
     private String shelfNo;
+    private String inspectStatus;
 
     /**
      * 库位id

ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsHppInStockDetailMapper.xml

@@ -11,6 +11,7 @@
         <result property="cardNo" column="return_barcode"/>
         <result property="instockNum" column="complete_amount"/>
         <result property="unitName" column="unit_name"/>
+        <result property="inspectStatus" column="inspect_status"/>
     </resultMap>
 
     <select id="semiSelectVehicleInfo" resultMap="hpp">
@@ -22,7 +23,8 @@
                base.material_code,
                unit_name,
                shift_id,
-               class_team_id
+               class_team_id,
+               prod.inspect_status
         from prod_product_plan_detail_2 prod
                  left join base_material_info base on prod.material_id = base.material_id
         where return_barcode=#{code}