新增出入库单所有序列号列表接口及经销商添加发货方式字段

src/custom/restcontroller/R.java

@@ -6826,6 +6826,11 @@ public class R {
         public static class v1 {
         }
     }
+
+    public static class ID2025110514431703 {
+        public static class v1 {
+        }
+    }
 }
 
 

src/custom/restcontroller/webmanage/sale/agents/SQL/经销商修改.sql

@@ -13,6 +13,7 @@ set changeuserid=$changeuserid$,
     aftersalesphonenumber=$aftersalesphonenumber$,
     islimitaccessories=$islimitaccessories$,
     islimitorder=$islimitorder$,
-    signingstate=$signingstate$
+    signingstate=$signingstate$,
+    delivery=$delivery$
 where siteid = $siteid$
   and sa_agentsid = $sa_agentsid$

src/custom/restcontroller/webmanage/sale/agents/SQL/经销商列表查询.sql

@@ -21,7 +21,8 @@ select t1.sys_enterpriseid,
        case when t1.status='1' then '审核' else '新建' end status,
        t1.islimitaccessories,
        t1.islimitorder,
-       t1.signingstate
+       t1.signingstate,
+       t1.delivery
 from sa_agents t1
          inner join sys_enterprise t2 on t1.siteid = t2.siteid and t1.sys_enterpriseid = t2.sys_enterpriseid
 where t1.siteid = $siteid$

src/custom/restcontroller/webmanage/sale/agents/SQL/经销商新增.sql

@@ -1,6 +1,6 @@
 insert into sa_agents(siteid, sa_agentsid, sys_enterpriseid, createby, createdate, changeuserid,
                       changeby, changedate, agentnum, type, parentid,
-                      signdate, status, isservice,priceadjustment,entity,submitautocheck,presalesphonenumber,aftersalesphonenumber,islimitaccessories,islimitorder,signingstate)
+                      signdate, status, isservice,priceadjustment,entity,submitautocheck,presalesphonenumber,aftersalesphonenumber,islimitaccessories,islimitorder,signingstate,delivery)
 select $siteid$,
        $sa_agentsid$,
        $sys_enterpriseid$,
@@ -22,4 +22,5 @@ select $siteid$,
        $aftersalesphonenumber$,
        $islimitaccessories$,
        $islimitorder$,
-       $signingstate$
+       $signingstate$,
+       $delivery$

src/custom/restcontroller/webmanage/sale/agents/SQL/经销商详情查询.sql

@@ -27,6 +27,7 @@ select t1.sys_enterpriseid,
        t2.entity,
        t2.presalesphonenumber,
        t2.aftersalesphonenumber,
+       t2.delivery,
        (SELECT enterprisename  FROM sys_enterprise WHERE sys_enterpriseid = (SELECT sys_enterpriseid FROM sa_agents WHERE sa_agentsid = t2.parentid)) parent_enterprisename,
        t4.erpagentnum,
        t2.isservice,

src/custom/restcontroller/webmanage/sale/agents/agents.java

@@ -135,6 +135,7 @@ public class agents extends Controller {
         String signdate = content.getStringValue("signdate");
         long isallsale = content.getLongValue("isallsale");
         String entity = content.getStringValue("entity");
+        String delivery = content.getStringValue("delivery");
 
 
         if (parentid != 0 && dbConnect.runSqlQuery("select * from sa_agents where siteid='" + siteid + "' and sa_agentsid=" + parentid).isEmpty()) {
@@ -186,6 +187,8 @@ public class agents extends Controller {
         sqlFactory.addParameter("islimitaccessories",islimitaccessories);
         sqlFactory.addParameter("islimitorder",islimitorder);
         sqlFactory.addParameter("signingstate",signingstate);
+        sqlFactory.addParameter("delivery",delivery);
+
 
         sqllist.add(sqlFactory.getSQL());
 

src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -64,7 +64,7 @@ public class Order extends Controller {
             sys_enterpriseid = sys_enterpriseid_temp;
         }
         String type = content.getString("type");
-        Rows agentRows = dbConnect.runSqlQuery("SELECT islimitorder,islimitaccessories FROM sa_agents WHERE siteid='" + siteid + "' AND `status`='1' AND sys_enterpriseid=" + sys_enterpriseid);
+        Rows agentRows = dbConnect.runSqlQuery("SELECT islimitorder,islimitaccessories,delivery FROM sa_agents WHERE siteid='" + siteid + "' AND `status`='1' AND sys_enterpriseid=" + sys_enterpriseid);
         if (agentRows.isEmpty()) {
             return getErrReturnObject().setErrMsg("当前企业不存在或已禁用，无法下单").toString();
         } else {
@@ -263,7 +263,7 @@ public class Order extends Controller {
         sqlFactory.addParameter("projectnote", content.getStringValue("projectnote"));
         sqlFactory.addParameter("abstract", content.getStringValue("abstract"));
 
-        sqlFactory.addParameter("delivery", content.getStringValue("delivery"));
+        sqlFactory.addParameter("delivery", StringUtils.isBlank(agentRows.get(0).getString("delivery"))?content.getStringValue("delivery"):agentRows.get(0).getString("delivery"));
         sqlFactory.addParameter("tracknumber", content.getStringValue("tracknumber"));
 
         String sql = sqlFactory.getSQL();
@@ -341,7 +341,7 @@ public class Order extends Controller {
         }
 
 
-        Rows agentRows = dbConnect.runSqlQuery("SELECT islimitorder,islimitaccessories FROM sa_agents WHERE siteid='" + siteid + "' AND `status`='1' AND sys_enterpriseid=" + sys_enterpriseid);
+        Rows agentRows = dbConnect.runSqlQuery("SELECT islimitorder,islimitaccessories,delivery FROM sa_agents WHERE siteid='" + siteid + "' AND `status`='1' AND sys_enterpriseid=" + sys_enterpriseid);
         if (agentRows.isEmpty()) {
             return getErrReturnObject().setErrMsg("当前企业不存在或已禁用，无法下单").toString();
         } else {
@@ -460,7 +460,7 @@ public class Order extends Controller {
         sqlFactory.addParameter("projectnote", content.getStringValue("projectnote"));
         sqlFactory.addParameter("abstract", content.getStringValue("abstract"));
 
-        sqlFactory.addParameter("delivery", content.getStringValue("delivery"));
+        sqlFactory.addParameter("delivery", StringUtils.isBlank(agentRows.get(0).getString("delivery"))?content.getStringValue("delivery"):agentRows.get(0).getString("delivery"));
         sqlFactory.addParameter("tracknumber", content.getStringValue("tracknumber"));
 
         dbConnect.runSqlUpdate(sqlFactory);

src/custom/restcontroller/webmanage/sale/stockbill/stockbillitemssku.java

@@ -55,6 +55,41 @@ public class stockbillitemssku extends Controller {
         return getSucReturnObject().setData(rows).toString();
     }
 
+    @API(title = "出入库单所有序列号列表", apiversion = R.ID2025110514431703.v1.class)
+    public String querystockbillSkus() throws YosException {
+        /*
+         * 过滤条件设置
+         */
+        long st_stockbillid=content.getLong("st_stockbillid");
+        StringBuffer where = new StringBuffer(" 1=1 ");
+        if (content.containsKey("where")) {
+            JSONObject whereObject = content.getJSONObject("where");
+            if (whereObject.containsKey("condition") && !"".equals(whereObject.getString("condition"))) {
+                where.append(" and(");
+                where.append(" t2.itemname like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("or t2.model like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("or t2.spec like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("or t1.sku like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append(")");
+            }
+        }
+
+
+        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "st_stockbill_items_sku",  "*");
+        querySQL.setTableAlias("t1");
+        querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t2", "t1.itemid=t2.itemid and t1.siteid = t2.siteid","itemno","itemname"
+                ,"spec","model");
+        querySQL.addJoinTable(JOINTYPE.left, "st_stock", "t3", "t1.stockid = t3.stockid AND t1.siteid = t3.siteid","stockname");
+        querySQL.setSiteid(siteid);
+        querySQL.setWhere("t1.st_stockbillid",st_stockbillid);
+        querySQL.setWhere(where);
+        querySQL.setPage(pageSize, pageNumber);
+        Rows rows = querySQL.query();
+
+        return getSucReturnObject().setData(rows).toString();
+    }
+
+
     @API(title = "删除", apiversion = R.ID2025101816382303.v1.class)
     @CACHEING_CLEAN(apiClass = {stockbill.class, stockbillitems.class, stockbillitemssku.class})
     public String deletemxsku() throws YosException {