Merge remote-tracking branch 'Gogs/develop' into develop

src/apps/tagents_titem/tagents_titem.java

@@ -49,6 +49,7 @@ public class tagents_titem extends PaoCust {
             setValue("FSPEC",titem.getPao(0).getString("FSPEC"),11l);
             setValue("FITEMNAME",titem.getPao(0).getString("FITEMNAME"),11l);
             setValue("titemid",titem.getPao(0).getUniqueIDValue(),11l);
+            setValue("fisused",true,11l);
         }
     }
     @Override

src/rest/openapi/restcontroller/housekeeper/titem/AgentTitem.java

@@ -30,8 +30,12 @@ public class AgentTitem extends Controller {
         if(where!=null){
             DBConnect dbConnect=new DBConnect();
             if(where.containsKey("fitemname")&&!StringUtils.isBlank(where.getString("fitemname"))){
-                wherestr+=" and t.fitemname like '%"+where.getString("fitemname")+"%'";
+                wherestr+=" and (t.fitemname like '%"+where.getString("fitemname")+"%' " +
+                        "or t.fitemno like '%"+where.getString("fitemname")+"%' "+
+                        "or t.fmodel like '%"+where.getString("fitemname")+"%' "+
+                        "or t.fspec like '%"+where.getString("fitemname")+"%' )";
             }
+
             if(where.containsKey("fisused")&&where.getString("fisused").equals("true")){
                 wherestr+=" and t.fisused=1";
             }

src/rest/openapi/restcontroller/housekeeper/titem/HeadTitem.java

@@ -1,5 +1,6 @@
 package openapi.restcontroller.housekeeper.titem;
 
+import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import openapi.base.Controller;
 import openapi.base.SQLFactory;
@@ -33,14 +34,16 @@ public class HeadTitem extends Controller {
         if(where!=null){
             DBConnect dbConnect=new DBConnect();
             if(where.containsKey("fitemname")&&!StringUtils.isBlank(where.getString("fitemname"))){
-                wherestr+=" and fitemname like '%"+where.getString("fitemname")+"%'";
+                wherestr+=" and (fitemname like '%"+where.getString("fitemname")+"%' or FITEMNO like '%"+where.getString("fitemname")+"%')";
             }
             SQLFactory factory=new SQLFactory(this,"总部物料查询",pageSize,pageNumber,"t.fitemno");
             factory.addParameter("siteid",siteid);
+            factory.addParameter("fagentnum",fagentnum);
             factory.addParameter_SQL("where",wherestr);
             Rows rows = dbConnect.runSqlQuery(factory.getSQL());
             SQLFactory imagefactory=new SQLFactory(this,"总部物料图片查询");
             imagefactory.addParameter("siteid",siteid);
+
             imagefactory.addParameter_SQL("fitemno",rows.getInWhere("fitemno"));
             Rows image_rows = dbConnect.runSqlQuery(imagefactory.getSQL());
             RowsMap fitemno = image_rows.toRowsMap("fitemno");
@@ -90,6 +93,85 @@ public class HeadTitem extends Controller {
             }
         }
         return getReturnObject_err("缺少where参数").toString();
+    }
+    /**批量加入本站物料**/
+    public String addtitems(){
+        if(StringUtils.isBlank(hrid))return getReturnObject_err("hrid为空").toString();
+        if(StringUtils.isBlank(fagentnum))return getReturnObject_err("fagentnum为空").toString();
+        if(StringUtils.isBlank(siteid))return getReturnObject_err("siteid为空").toString();
+        JSONObject where = content.getJSONObject("where");
+        String s[]={"fitemno"};
+        for (String s1 : s) {
+            if(!where.containsKey(s1)||StringUtils.isBlank(where.getString(s1)))return getReturnObject_err("缺少"+s1+"参数").toString();
+        }
+        if(where!=null){
+            try {
+                PaoSetRemote tagents = P2Server.getP2Server().getPaoSet("TAGENTS", P2Server.getP2Server().getSystemUserInfo());
+                tagents.setInsertSite(siteid);
+                tagents.setWhere("FAGENTNUM='"+fagentnum+"'");
+                tagents.reset();
+                if(!tagents.isEmpty()){
+                    PaoRemote tagents_pao = tagents.getPao(0);
+                    JSONArray fitemno = where.getJSONArray("fitemno");
+                    for (Object o : fitemno) {
+                        String fitemno_child=(String) o;
+                        PaoSetRemote tagents_titem = tagents_pao.getPaoSet("TAGENTS_titem");
+                        tagents_titem.setWhere("fitemno='"+fitemno_child+"'");
+                        tagents_titem.reset();
+                        if(tagents_titem.isEmpty()){
+                            PaoRemote remote = tagents_titem.addAtEnd();
+                            remote.setValue("FITEMNO",fitemno_child,2l);
+                            tagents_titem.save();
+                        }
+                    }
 
+                    return getReturnObject_suc().toString();
+                }
+                return getReturnObject_err("该经销商不存在").toString();
+            } catch (P2Exception e) {
+                return getReturnObject_err(e.getMessage()).toString();
+            }
+        }
+        return getReturnObject_err("缺少where参数").toString();
     }
+    /**批量删除本站物料**/
+    public String detetitems(){
+        if(StringUtils.isBlank(hrid))return getReturnObject_err("hrid为空").toString();
+        if(StringUtils.isBlank(fagentnum))return getReturnObject_err("fagentnum为空").toString();
+        if(StringUtils.isBlank(siteid))return getReturnObject_err("siteid为空").toString();
+        JSONObject where = content.getJSONObject("where");
+        String s[]={"fitemno"};
+        for (String s1 : s) {
+            if(!where.containsKey(s1)||StringUtils.isBlank(where.getString(s1)))return getReturnObject_err("缺少"+s1+"参数").toString();
+        }
+        if(where!=null){
+            try {
+                PaoSetRemote tagents = P2Server.getP2Server().getPaoSet("TAGENTS", P2Server.getP2Server().getSystemUserInfo());
+                tagents.setInsertSite(siteid);
+                tagents.setWhere("FAGENTNUM='"+fagentnum+"'");
+                tagents.reset();
+                if(!tagents.isEmpty()){
+                    PaoRemote tagents_pao = tagents.getPao(0);
+                    JSONArray fitemno = where.getJSONArray("fitemno");
+                    for (Object o : fitemno) {
+                        PaoSetRemote tagents_titem = tagents_pao.getPaoSet("TAGENTS_titem");
+                        String fitemno_child=(String) o;
+                        tagents_titem.setWhere("fitemno='"+fitemno_child+"'");
+                        tagents_titem.reset();
+                        if(!tagents_titem.isEmpty()){
+                            tagents_titem.getPao(0).delete();
+                            tagents_titem.save();
+                        }
+                    }
+
+                    return getReturnObject_suc().toString();
+                }
+                return getReturnObject_err("该经销商不存在").toString();
+            } catch (P2Exception e) {
+                return getReturnObject_err(e.getMessage()).toString();
+            }
+        }
+        return getReturnObject_err("缺少where参数").toString();
+    }
+
 }

src/rest/openapi/restcontroller/housekeeper/titem/SQL/总部物料查询.sql

@@ -1,2 +1,5 @@
-select t.fitemno,t.fitemname,t.fmodel,t.fspec,t.fisused,t.fieldname,t.fbrand from titem t
-where t.siteid=$siteid$ and t.FISSERVICE=1 and $where$
+select t.fitemno,t.fitemname,t.fmodel,t.fspec,t.fisused,t.fieldname,t.fbrand,
+       case when EXISTS(select 1 from TAGENTS_titem t1 where FAGENTNUM=$fagentnum$ and t1.FITEMNO=t.FITEMNO) then 1 else 0 end fisinsert,
+       case when EXISTS(select 1 from TAGENTS_titem t1 where FAGENTNUM=$fagentnum$ and t1.FITEMNO=t.FITEMNO and fisused=1) then 1 else 0 end fistagentused
+       from titem t
+where t.siteid=$siteid$ and t.FISSERVICE=1 and t.FISONSALE=1 and $where$

src/rest/openapi/restcontroller/housekeeper/user/Worker.java

@@ -228,4 +228,6 @@ public class Worker extends Controller {
         }
         return getReturnObject_err("where²ÎÊýΪ¿Õ").toString();
     }
+
+
 }