k3同步（商品档案及价格，经销商，销售出库单同步测试完成）

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

@@ -6,6 +6,7 @@ import common.YosException;
 import common.annotation.API;
 import common.data.Rows;
 import common.data.SQLFactory;
+import org.apache.commons.lang.StringUtils;
 import restcontroller.R;
 
 import java.text.SimpleDateFormat;
@@ -26,7 +27,7 @@ public class agents extends Controller {
      *
      * @return
      */
-    @API(title = "更新YOS经销商档案", apiversion = R.ID20230715095103.v1.class)
+    @API(title = "更新YOS经销商档案", apiversion = R.ID20230715095103.v1.class,accesstoken = false)
     public String updateAgent() throws  YosException {
         String msg = "";
         int code = 1;
@@ -68,7 +69,7 @@ public class agents extends Controller {
             // 是否启用
             String fisused = content.getString("fisused");
             // 启用时间
-            String fuseddate = content.getString("fuseddate");
+            String fuseddate = content.getStringValue("fuseddate");
 
             // 创建人
             String createby = content.getString("createby");
@@ -83,7 +84,7 @@ public class agents extends Controller {
 
             Rows agentsRows = dbConnect.runSqlQuery("select * from sa_agents where siteid='lsa' and agentnum ='"+fagentnum+"'");
             SQLFactory sqlFactory;
-            if(agentsRows.isNotEmpty()){
+            if(agentsRows.isEmpty()){
                 SQLFactory sqlFactory1 = new SQLFactory(this, "企业新增");
                  long sys_enterpriseid=createTableID("sys_enterprise");
                 sqlFactory1.addParameter("sys_enterpriseid",sys_enterpriseid);
@@ -178,6 +179,8 @@ public class agents extends Controller {
             sqlFactory.addParameter("siteid","lsa");
             sqlFactory.addParameter("agentnum",fagentnum);
             sqlFactory.addParameter("createby",createby);
+            sqlFactory.addParameter("username",changeby);
+
             sqlFactory.addParameter("createdate",getDate(createdate));
             sqlFactory.addParameter("changeby",changeby);
             sqlFactory.addParameter("changedate",getDate(changedate));
@@ -185,7 +188,7 @@ public class agents extends Controller {
             sqlFactory.addParameter("type", "普通经销商");
             sqlFactory.addParameter("k3outcode", foutagentnum);
             sqlFactory.addParameter("parentid",0);
-            sqlFactory.addParameter("signdate", getDate(fuseddate));
+            sqlFactory.addParameter("signdate", StringUtils.isBlank(fuseddate)?"null":getDate(fuseddate));
             sqlFactory.addParameter("isservice", 0);
             sqlFactory.addParameter("priceadjustment",0);
             if(fisused.equals("0")){
@@ -215,10 +218,10 @@ public class agents extends Controller {
     }
 
 
-    public Date getDate(String date) {
+    public String getDate(String date) {
         try {
             Date a = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").parse(date);
-            return a;
+            return new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(a);
         } catch (Exception e) {
             e.printStackTrace();
         }

src/custom/restcontroller/webmanage/lsak3/item/item.java

@@ -26,13 +26,13 @@ public class item extends Controller {
      *
      * @return
      */
-    @API(title = "更新YOS商品档案", apiversion = R.ID20230715111203.v1.class)
+    @API(title = "更新YOS商品档案", apiversion = R.ID20230715111203.v1.class,accesstoken = false)
     public String updateItem() throws YosException{
         String msg = "";
         int code = 1;
         ArrayList<String> sqllist = new ArrayList<>();
         //单位
-        Rows unitRows = dbConnect.runSqlQuery("SELECT unitid,unitname from  plm_unit WHERE siteid = '" + siteid + "'");
+        Rows unitRows = dbConnect.runSqlQuery("SELECT unitid,unitname from  plm_unit WHERE siteid = 'lsa'");
         RowsMap unitRowsMap = unitRows.toRowsMap("unitname");
         try {
             // 商品编号
@@ -107,12 +107,12 @@ public class item extends Controller {
             //功率
             String fgl = content.getString("fgl");
 
-            Rows itemRows = dbConnect.runSqlQuery("select * from plm_items where siteid='lsa' and itemno='"+fitemno+"'");
+            Rows itemRows = dbConnect.runSqlQuery("select * from plm_item where siteid='lsa' and itemno='"+fitemno+"'");
             SQLFactory sqlFactory;
             if(itemRows.isEmpty()){
                 long itemid = createTableID("plm_item");
                 sqlFactory = new SQLFactory(this,"货品档案新增");
-
+                sqlFactory.addParameter("itemid",itemid);
                 // 货品档案扩展属性字段表
                 SQLFactory sqlFactory1 = new SQLFactory(this, "货品档案-扩展新增");
                 sqlFactory1.addParameter("siteid", "lsa");
@@ -140,6 +140,7 @@ public class item extends Controller {
             }else {
                 long itemid = itemRows.get(0).getLong("itemid");
                 sqlFactory = new SQLFactory(this,"货品档案更新");
+                sqlFactory.addParameter("itemid",itemid);
                 Rows itemextendRows= dbConnect.runSqlQuery("select * from plm_itemextend where siteid='lsa' and itemid="+itemid);
                 SQLFactory sqlFactory1;
                 if(itemextendRows.isEmpty()){
@@ -171,8 +172,7 @@ public class item extends Controller {
                 sqllist.add(sqlFactory1.getSQL());
 
             }
-            sqlFactory.addParameter("siteid", siteid);
-            sqlFactory.addParameter("itemid", createTableID("plm_item"));
+            sqlFactory.addParameter("siteid", "lsa");
             sqlFactory.addParameter("username",checkby);
             sqlFactory.addParameter("userid", 1);
             sqlFactory.addParameter("itemno", fitemno);
@@ -237,6 +237,9 @@ public class item extends Controller {
             sqlFactory.addParameter("cheek", fbk);
             sqlFactory.addParameter("iscustomsize", fisdz);
             sqlFactory.addParameter("delistingstatus","");
+            sqlFactory.addParameter("marketingcategory","");
+            sqlFactory.addParameter("customprice",0);
+
 
             sqlFactory.addParameter("ismodule", 0);
             sqlFactory.addParameter("packageqty", fpackingqty);
@@ -245,8 +248,9 @@ public class item extends Controller {
             sqlFactory.addParameter("sa_customschemeid", 0);
             sqlFactory.addParameter("financeclasstype","");
             sqlFactory.addParameter("stockno","");
-            sqlFactory.addParameter("volume", "");
+            sqlFactory.addParameter("volume", 0);
             sqlFactory.addParameter("k3outcode", foutitemno);
+
             if(fisdz.equals("1")){
                 sqlFactory.addParameter("widthschemeid",1);
                 sqlFactory.addParameter("lengthschemeid", 1);
@@ -267,6 +271,7 @@ public class item extends Controller {
             code = 0;
         }
         dbConnect.runSqlUpdate(sqllist);
+
         JSONObject returnObject=new JSONObject();
         returnObject.put("msg", msg);
         returnObject.put("code", code);

src/custom/restcontroller/webmanage/lsak3/itemPrice/itemPrice.java

@@ -24,8 +24,8 @@ public class itemPrice extends Controller {
      *
      * @return
      */
-    @API(title = "更新商品价格", apiversion = R.ID20230715144203.v1.class)
-    public String updateItem_Price() {
+    @API(title = "更新商品价格", apiversion = R.ID20230715144203.v1.class,accesstoken = false)
+    public String updateItem_Price() throws YosException{
         String msg = "";
         int code = 1;
         ArrayList<String> sqllist = new ArrayList<>();
@@ -40,7 +40,7 @@ public class itemPrice extends Controller {
             String fprice = content.getString("fprice");
 
 
-            Rows itemRows = dbConnect.runSqlQuery("select * from plm_items where siteid='lsa' and itemno='"+fitemno+"'");
+            Rows itemRows = dbConnect.runSqlQuery("select * from plm_item where siteid='lsa' and itemno='"+fitemno+"'");
             if(itemRows.isEmpty()){
                 code=0;
                 msg="商品不存在，无法新增商品价格";
@@ -55,7 +55,7 @@ public class itemPrice extends Controller {
                     sqlFactory.addParameter("sa_itempriceid", itempriceRows.get(0).getLong("sa_itempriceid"));
                 }
                 sqlFactory.addParameter("itemno",fitemno);
-                sqlFactory.addParameter("siteid", siteid);
+                sqlFactory.addParameter("siteid", "lsa");
                 sqlFactory.addParameter("itemid", itemRows.get(0).getLong("itemid"));
                 sqlFactory.addParameter("userid", 1);
                 sqlFactory.addParameter("pricegrade", fpricegrade);
@@ -72,6 +72,7 @@ public class itemPrice extends Controller {
             msg = e.getMessage();
             code = 0;
         }
+        dbConnect.runSqlUpdate(sqllist);
         JSONObject returnObject =new JSONObject();
         returnObject.put("msg", msg);
         returnObject.put("code", code);

src/custom/restcontroller/webmanage/lsak3/stockbill/SQL/销售出库单明细新增.sql

@@ -1,5 +1,6 @@
-insert into st_stockbill_items (siteid, st_stockbillid, sa_dispatch_itemsid, rowno, itemid, qty,remarks)
+insert into st_stockbill_items (siteid, st_stockbill_itemsid,st_stockbillid, sa_dispatch_itemsid, rowno, itemid, qty,remarks)
 select $siteid$,
+       $st_stockbill_itemsid$,
        $st_stockbillid$,
        $sa_dispatch_itemsid$,
        $rowno$,

src/custom/restcontroller/webmanage/lsak3/stockbill/stockbill.java

@@ -30,7 +30,7 @@ public class stockbill extends Controller {
      * @return
      * @throws YosException
      */
-    @API(title = "更新YOS销售出库单", apiversion = R.ID20230717144803.v1.class)
+    @API(title = "更新YOS销售出库单", apiversion = R.ID20230717144803.v1.class,accesstoken = false)
     public String updateIcstockbill() throws YosException{
         String msg = "";
         int code = 1;
@@ -78,7 +78,7 @@ public class stockbill extends Controller {
                 /**
                  * DRP不存在销售出库单，且中间表状态为审核且不在删除状态时，DRP中需新增该销售出库单
                  */
-                SQLFactory sqlFactory =new SQLFactory("销售出库单新增");
+                SQLFactory sqlFactory =new SQLFactory(this,"销售出库单新增");
                 long st_stockbillid=createTableID("st_stockbill");
                 sqlFactory.addParameter("siteid","lsa");
                 sqlFactory.addParameter("st_stockbillid",st_stockbillid);
@@ -109,7 +109,7 @@ public class stockbill extends Controller {
                     long sainvoicedetailid = jsonObject.getLong("sainvoicedetailid");
                     //String fbatchno = jsonObject.getString("fbatchno");
                     String fdetailnotes = jsonObject.getString("fnotes");
-                    SQLFactory sqlFactorydetail =new SQLFactory("销售出库单明细新增");
+                    SQLFactory sqlFactorydetail =new SQLFactory(this,"销售出库单明细新增");
                     sqlFactorydetail.addParameter("siteid","lsa");
                     sqlFactorydetail.addParameter("st_stockbill_itemsid", createTableID("st_stockbill_items"));
                     sqlFactorydetail.addParameter("st_stockbillid", st_stockbillid);
@@ -161,10 +161,10 @@ public class stockbill extends Controller {
         return returnObject.toString();
     }
 
-    public Date getDate(String date) {
+    public String getDate(String date) {
         try {
             Date a = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").parse(date);
-            return a;
+            return new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(a);
         } catch (Exception e) {
             e.printStackTrace();
         }