2 years ago
parent
commit
832273cc67

+ 0 - 2
platform-dao/src/main/java/com/platform/dao/vo/export/store/ExportOutStoreFormVO.java

@@ -101,7 +101,5 @@ public class ExportOutStoreFormVO implements Serializable {
   @Excel(name = "数量", orderNum = "14")
   private String realNum;
 
-  @Excel(name = "出库单备注", orderNum = "15")
-  private String remark2;
 
 }

+ 1 - 0
platform-dao/src/main/java/com/platform/dao/vo/query/store/OutStoreFormVO.java

@@ -139,4 +139,5 @@ public class OutStoreFormVO extends BaseVO implements Serializable {
     private String unit;
 
     private BigDecimal realNum;
+
 }

+ 1 - 1
platform-dao/src/main/resources/mapper/store/OutStoreFormMapper.xml

@@ -286,7 +286,7 @@ outstoreform.process_instance_id,
 
     <select id="selectLists" resultType="com.platform.dao.vo.query.store.OutStoreFormVO"
             parameterType="com.platform.dao.dto.store.OutStoreFormDTO">
-        SELECT * FROM t_out_store_form form JOIN t_out_store_detail detail ON
+        SELECT form.*,detail.spare_name,detail.ggxh,detail.unit,detail.real_num FROM t_out_store_form form JOIN t_out_store_detail detail ON
         form.id=detail.`out_id`
         <where>
             <if test="ids!=null and ids.size>0">