From ffffbd25e21205601cb9ae60e93ebb2e31b9607e Mon Sep 17 00:00:00 2001
From: Administrator <hbal>
Date: 星期三, 15 二月 2023 17:43:11 +0800
Subject: [PATCH] 义瑞可以选择厂区
---
JavaSource/com/mandi/basicconfig/mapper/FdRepertoryNexusMapper.java | 2 +-
JavaSource/com/mandi/fendan/controller/Fd_RepertoryNexusController.java | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/JavaSource/com/mandi/basicconfig/mapper/FdRepertoryNexusMapper.java b/JavaSource/com/mandi/basicconfig/mapper/FdRepertoryNexusMapper.java
index 83278f8..01abf1f 100644
--- a/JavaSource/com/mandi/basicconfig/mapper/FdRepertoryNexusMapper.java
+++ b/JavaSource/com/mandi/basicconfig/mapper/FdRepertoryNexusMapper.java
@@ -33,7 +33,7 @@
@Select("select * from fd_repertory_nexus where sdepartNo=#{sdepartNo} ")
public List<FdRepertoryNexus> getBySdepartNo(String sdepartNo);
- @Select("select b.name+'('+a.name+')' ckName,b.code+'_'+a.depotNo as code from repertory a LEFT JOIN nc_ywdy b on a.pk_org =b.pkid where a.depotNo LIKE 'C%' and b.code in ('101','102','103','113','111') ORDER BY b.code ASC ")
+ @Select("select b.name+'('+a.name+')' ckName,b.code+'_'+a.depotNo as code from repertory a LEFT JOIN nc_ywdy b on a.pk_org =b.pkid where a.depotNo LIKE 'C%' and b.code in ('101','102','103','113','111','114') ORDER BY b.code ASC ")
public List<Map<String, Object>> getAllCk();
diff --git a/JavaSource/com/mandi/fendan/controller/Fd_RepertoryNexusController.java b/JavaSource/com/mandi/fendan/controller/Fd_RepertoryNexusController.java
index f4a864f..e08b06d 100644
--- a/JavaSource/com/mandi/fendan/controller/Fd_RepertoryNexusController.java
+++ b/JavaSource/com/mandi/fendan/controller/Fd_RepertoryNexusController.java
@@ -43,9 +43,7 @@
@RequestMapping(value = "/getallCkList.htm", method = {RequestMethod.POST })
@ResponseBody
public String getList(HttpServletRequest r,HttpServletResponse re){
-
-
-
+ // 姝ゅ闇�瑕佹敼鎴愬彲浠ラ厤缃殑锛屽彲浠ラ厤缃殑鍘傚尯浠撳簱
List<Map<String, Object>> ckList = rnper.getAllCk();
PageResult<Map<String, Object>> prr=new PageResult<Map<String,Object>>();
prr.setCode(0);
--
Gitblit v1.9.3