商品档案增加poday,sa_supplierid字段

src/custom/restcontroller/webmanage/sale/item/Item.java

@@ -246,6 +246,8 @@ public class Item extends Controller {
         sqlFactory.addParameter("shapesize", content.getStringValue("shapesize"));
         sqlFactory.addParameter("kw", content.getStringValue("kw"));
         sqlFactory.addParameter("gysmc", content.getStringValue("gysmc"));
+        sqlFactory.addParameter("poday", content.getIntValue("poday"));
+        sqlFactory.addParameter("sa_supplierid", content.getLongValue("sa_supplierid"));
 
 
         String topclassnum="";
@@ -521,7 +523,8 @@ public class Item extends Controller {
         sqlFactory.addParameter("topclassnum", item.getString("topclassnum"));
         sqlFactory.addParameter("kw", item.getString("kw"));
         sqlFactory.addParameter("gysmc", item.getString("gysmc"));
-
+        sqlFactory.addParameter("poday", item.getLong("poday"));
+        sqlFactory.addParameter("sa_supplierid", item.getLong("sa_supplierid"));
         sqlList.add(sqlFactory.getSQL());
         // 货品档案扩展属性字段表
 
@@ -926,6 +929,9 @@ public class Item extends Controller {
                 "depno","depname");
         querySQL.addJoinTable(JOINTYPE.left, "st_stock", "t17", "t17.stockno = t1.stockno AND t17.siteid = t1.siteid",
                 "stockname");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_supplier", "t18", "t18.sa_supplierid = t1.sa_supplierid AND t18.siteid = t1.siteid",
+                "suppno","suppname","suppshortname");
+
 
         querySQL.setWhere("t1.siteid", siteid);
         querySQL.setWhere(where);
@@ -1794,6 +1800,8 @@ public class Item extends Controller {
                     sqlFactory.addParameter("isservice", row.getString("isservice").equals("是") ? 1 : 0);
                     sqlFactory.addParameter("kw", row.getString("kw"));
                     sqlFactory.addParameter("gysmc", row.getString("gysmc"));
+                    sqlFactory.addParameter("poday", row.getLong("poday"));
+                    sqlFactory.addParameter("sa_supplierid", row.getLong("sa_supplierid"));
 
                     sqlList.add(sqlFactory.getSQL());
                     // 货品档案扩展属性字段表

src/custom/restcontroller/webmanage/sale/item/SQL/货品档案新增.sql

@@ -6,7 +6,7 @@ insert into plm_item (siteid, itemid, createby, createdate, changeuserid, change
                       sa_customschemeid, cheek, delistingstatus, financeclasstype, stockno, volume, marketingcategory,
                       pricingmetod,cheekschemeid,colorschemeid,materialschemeid,cost,grossprofit,grossprofitmargin,saleprice,
                       rate,grade,custamount,safeqty,icaddqty,icminqty,iswriteoff,isnegative,ispartorderautocheck,islimitemparts,itemname_print,
-                      applicablegassource,hygienelicensenum,departmentid,executionstandards,itemclsnum,outplace,repairattribute,shapesize,topclassnum,aftersalesitemno,kw,gysmc)
+                      applicablegassource,hygienelicensenum,departmentid,executionstandards,itemclsnum,outplace,repairattribute,shapesize,topclassnum,aftersalesitemno,kw,gysmc,poday,sa_supplierid)
 values ($siteid$, $itemid$, $username$, CURRENT_TIME, $userid$, $username$, CURRENT_TIME, $itemno$, $unitid$,
         $isauxunit$, $unitgroupid$, $itemname$, $isonsale$, '新建', $model$, $spec$, $orderminqty$, $orderaddqty$,
         $orderminqty_auxunit$, $orderaddqty_auxunit$, $remarks$, $barcode$, $skucontrol$, $batchcontrol$, $grossweight$,
@@ -15,4 +15,4 @@ values ($siteid$, $itemid$, $username$, CURRENT_TIME, $userid$, $username$, CURR
         $iswoodproducts$, $sa_customschemeid$, $cheek$, $delistingstatus$, $financeclasstype$, $stockno$, $volume$,
         $marketingcategory$, $pricingmetod$,$cheekschemeid$,$colorschemeid$,$materialschemeid$,$cost$,$grossprofit$,$grossprofitmargin$,$saleprice$,
         $rate$,$grade$,$custamount$,$safeqty$,$icaddqty$,$icminqty$,$iswriteoff$,$isnegative$,$ispartorderautocheck$,$islimitemparts$,$itemname_print$,
-        $applicablegassource$,$hygienelicensenum$,$departmentid$,$executionstandards$,$itemclsnum$,$outplace$,$repairattribute$,$shapesize$,$topclassnum$,$aftersalesitemno$,$kw$,$gysmc$)
+        $applicablegassource$,$hygienelicensenum$,$departmentid$,$executionstandards$,$itemclsnum$,$outplace$,$repairattribute$,$shapesize$,$topclassnum$,$aftersalesitemno$,$kw$,$gysmc$,$poday$,$sa_supplierid$)

src/custom/restcontroller/webmanage/sale/item/SQL/货品档案更新.sql

@@ -76,7 +76,9 @@ SET changeuserid=$userid$,
     topclassnum=$topclassnum$,
     aftersalesitemno=$aftersalesitemno$,
     kw=$kw$,
-    gysmc=$gysmc$
+    gysmc=$gysmc$,
+    poday=$poday$,
+    sa_supplierid=$sa_supplierid$
 WHERE itemid = $itemid$
   and siteid = $siteid$
 

src/custom/restcontroller/webmanage/sale/item/SQL/货品档案详情.sql

@@ -31,7 +31,10 @@ SELECT t1.*,
        ifnull(t13.price,0) price5,
        t14.depname,
        t15.stockname,
-       t15.kw
+       t15.kw,
+       t16.suppno,
+       t16.suppshortname,
+       t16.suppname
 FROM plm_item t1
          LEFT JOIN plm_unit t2 ON t2.unitid = t1.unitid AND t2.siteid = t1.siteid
          LEFT JOIN plm_itemextend t8 ON t8.itemid = t1.itemid AND t8.siteid = t1.siteid
@@ -46,5 +49,6 @@ FROM plm_item t1
          left join sa_itemprice t13 on t12.itemid = t1.itemid AND t12.siteid = t1.siteid and t12.pricegrade=5
          LEFT JOIN sys_department t14 ON t14.departmentid = t1.departmentid AND t14.siteid = t1.siteid
          LEFT JOIN st_stock t15 ON t15.stockno = t1.stockno AND t15.siteid = t1.siteid
+         LEFT JOIN sa_supplier t16 ON t16.sa_supplierid = t1.sa_supplierid AND t16.siteid = t1.siteid
 WHERE t1.siteid = $siteid$
   and t1.itemid = $itemid$

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

@@ -733,7 +733,7 @@ public class stockbill extends Controller {
 
     @API(title = "仓库确认", apiversion = R.ID2025050709505703.v1.class)
     public String confirm() throws YosException {
-        JSONArray st_stockbillids = content.getJSONArray("st_stockbillid");
+        JSONArray st_stockbillids = content.getJSONArray("st_stockbillids");
         boolean isconfirm = content.getBooleanValue("isconfirm");
         if (st_stockbillids.isEmpty()) {
             return getErrReturnObject().setErrMsg("请选择需要操作的出入库单")