zhs 2 vuotta sitten
vanhempi
commit
3af54feb3d

+ 1 - 1
src/main/java/com/tld/service/impl/QueryListServiceImpl.java

@@ -96,7 +96,7 @@ public class QueryListServiceImpl implements QueryListService {
             //导出数据汇总
             List<List<Object>> sheetDataList = new ArrayList<>();
             //表头数据
-            List<Object> head = Arrays.asList("会计年度", "会计期间", "仓库编号", "仓库名称", "库位名称", "物料编号", "物料名称", "主计量单位", "库存数量", "WBS编号", "安全库存", "库龄(天)", "核算分类名称", "物料分类名称", "所属公司编号", "所属公司");
+            List<Object> head = Arrays.asList("会计年度", "会计期间", "仓库编号", "仓库名称", "库位名称", "物料编号", "物料名称", "主计量单位", "库存数量", "WBS编号", "安全库存", "库龄(天)", "核算分类名称", "物料分类名称", "公司编号", "所属公司");
             //查询数据
             List<Map<String, Object>> list = queryListMapper.getStorageLocation(inventory);
             sheetDataList.add(head);

+ 1 - 2
src/main/java/com/tld/service/impl/UserMaterialServiceImpl.java

@@ -148,8 +148,7 @@ public class UserMaterialServiceImpl implements UserMaterialService {
     public void replaceUser(UserMaterial userMaterial) {
         try{
             Map<String, Object> map = userMaterialMapper.getMaterialVal(userMaterial);
-            userMaterial.setMaterialId(map.get("materialId").toString())
-                    .setUserId(map.get("id").toString());
+            userMaterial.setUserId(map.get("id").toString());
             userMaterialMapper.addUserMaterial(userMaterial);
         }catch (Exception e){
             e.printStackTrace();

+ 4 - 3
src/main/resources/mapper/QueryListMappeer.xml

@@ -158,9 +158,10 @@
             b.is_product as isProduct,
             c.name as name,
             c.code as code,
-            e.name as supplierName
-        FROM
-        tld_inventory a
+            e.name as supplierName,
+            a.wbs,
+            a.account_sleeve
+        FROM tld_inventory a
         LEFT JOIN tld_storage_location b ON a.storage_location_code = b.storage_location_code
         LEFT JOIN tld_material c ON a.material_id = c.tld_id
         LEFT JOIN tld_customer e ON a.supplier_id = e.code

+ 1 - 3
src/main/resources/mapper/UserMaterialMapper.xml

@@ -129,8 +129,6 @@
     </select>
     <!-- 查询物料跟用户id -->
     <select id="getMaterialVal" parameterType="java.util.Map" resultType="java.util.Map">
-        select (select tld_id from tld_material where code = #{materialId}) as materialId,
-               (select id from tld_user where user_name = #{userName}) as id
-               from dual
+        select id from tld_user where user_name = #{userName}
     </select>
 </mapper>