Merge branch 'master' of code.sz-chaohui.cn:miaoweiw/wios

src/main/java/com/starcharge/wios/dao/mappers/RejectMapper.xml

@@ -153,6 +153,7 @@
     left join t_delivery d on d.install_order = t.install_order
     left join t_delivery d on d.install_order = t.install_order
     left join t_order e  on e.id = t.install_order
     left join t_order e  on e.id = t.install_order
     where t.id = #{id,jdbcType=INTEGER}
     where t.id = #{id,jdbcType=INTEGER}
+    group by t.id
   </select>
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
     delete from t_reject
     delete from t_reject

src/main/java/com/starcharge/wios/export/Contants.java

@@ -92,4 +92,8 @@ public class Contants {
 
 
     public static final String export_reject_field =
     public static final String export_reject_field =
             "id,installOrder,materialName,materialCode,materialCategory,quantity,accountName,reason,warehouseName,status";
             "id,installOrder,materialName,materialCode,materialCategory,quantity,accountName,reason,warehouseName,status";
+    public static final String export_tauxiliaryMaterials_title = "序号,物料名称,物料编码,规格型号,计量单位,申请数量,申请人库存,申请状态,申请团队,物流单号,物流状态,收货状态,收件人,批准数量,申请时间";
+
+    public static final String export_tauxiliaryMaterials_field =
+            "id,materialName,materialCode,specification,measurementUnit,applyQuantity,currentySap,applyStatus,team,logisticOrder,logisticStatus,receivingStatus,recipents,approvedQuantity,applyTime";
 }
 }

src/main/java/com/starcharge/wios/export/impl/TauxiliaryMaterialsExport.java

+package com.starcharge.wios.export.impl;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.starcharge.wios.bo.SupplierBo;
+import com.starcharge.wios.dao.entity.Tauxiliarymaterials;
+import com.starcharge.wios.dao.mappers.TauxiliarymaterialsMapper;
+import com.starcharge.wios.export.Export;
+import com.starcharge.wios.service.SupplierService;
+import com.starcharge.wios.vo.SupplierVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 辅材查询导出
+ * 
+ * @author xgl
+ * @version [版本号, 2023年11月15日]
+ */
+@Service
+public class TauxiliaryMaterialsExport implements Export<Tauxiliarymaterials> {
+
+    @Autowired
+    private TauxiliarymaterialsMapper tauxiliarymaterialsMapper;
+    
+    @Override
+    public List<Tauxiliarymaterials> getExportList(String json) throws Exception {
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        Tauxiliarymaterials condition = mapper.readValue(json, Tauxiliarymaterials.class);
+        List<Tauxiliarymaterials> list = tauxiliarymaterialsMapper.selectTAuxiliaryMaterialsList(condition);
+        int no = 1;
+        for (Tauxiliarymaterials vo : list) {
+            vo.setId(no++);
+        }
+        return list;
+    }
+    
+}