配件核销单管理增加新建功能 （总部建）及商品档案新增字段

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

@@ -245,6 +245,7 @@ public class Item extends Controller {
         sqlFactory.addParameter("repairattribute", content.getStringValue("repairattribute"));
         sqlFactory.addParameter("shapesize", content.getStringValue("shapesize"));
         sqlFactory.addParameter("kw", content.getStringValue("kw"));
+        sqlFactory.addParameter("gysmc", content.getStringValue("gysmc"));
 
 
         String topclassnum="";
@@ -519,6 +520,7 @@ public class Item extends Controller {
         sqlFactory.addParameter("shapesize", item.getString("shapesize"));
         sqlFactory.addParameter("topclassnum", item.getString("topclassnum"));
         sqlFactory.addParameter("kw", item.getString("kw"));
+        sqlFactory.addParameter("gysmc", item.getString("gysmc"));
 
         sqlList.add(sqlFactory.getSQL());
         // 货品档案扩展属性字段表
@@ -1786,6 +1788,7 @@ 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"));
 
                     sqlList.add(sqlFactory.getSQL());
                     // 货品档案扩展属性字段表

src/custom/restcontroller/webmanage/sale/item/SQL/货品档案列表.sql

@@ -65,6 +65,7 @@ SELECT t1.itemid,
        t1.shapesize,
        t1.topclassnum,
        t1.kw,
+       t1.gysmc,
        t6.auxunitid,
        t6.unitgroupname,
        t7.unitname axunitname,

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)
+                      applicablegassource,hygienelicensenum,departmentid,executionstandards,itemclsnum,outplace,repairattribute,shapesize,topclassnum,aftersalesitemno,kw,gysmc)
 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$)
+        $applicablegassource$,$hygienelicensenum$,$departmentid$,$executionstandards$,$itemclsnum$,$outplace$,$repairattribute$,$shapesize$,$topclassnum$,$aftersalesitemno$,$kw$,$gysmc$)

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

@@ -75,7 +75,8 @@ SET changeuserid=$userid$,
     shapesize=$shapesize$,
     topclassnum=$topclassnum$,
     aftersalesitemno=$aftersalesitemno$,
-    kw=$kw$
+    kw=$kw$,
+    gysmc=$gysmc$
 WHERE itemid = $itemid$
   and siteid = $siteid$
 

src/custom/restcontroller/webmanage/sale/tpartreimbursement/tpartreimbursementdetail.java

@@ -128,7 +128,7 @@ public class tpartreimbursementdetail extends Controller {
         orderitemsQuery.addQueryFields("qty", "t1.tobeoffqty-ifnull(t2.sumqty,0)");
         Rows rows = orderitemsQuery.query();
         RowsMap rowsMap = rows.toRowsMap("sa_orderitemsid");
-        if(!rowscount.get(0).getBoolean("createflag")){
+//        if(!rowscount.get(0).getBoolean("createflag")){
             for (int i = 0; i < iteminfos.size(); i++) {
                 if(rowsMap.containsKey(iteminfos.getJSONObject(i).getStringValue("sa_orderitemsid"))){
                     if(rowsMap.get(iteminfos.getJSONObject(i).getStringValue("sa_orderitemsid")).get(0).getBigDecimal("qty").compareTo(iteminfos.getJSONObject(i).getBigDecimal("qty"))<0){
@@ -136,7 +136,7 @@ public class tpartreimbursementdetail extends Controller {
                     }
                 }
             }
-        }
+//        }
 
         int i = 0;
         long[] sa_tpartreimbursementdetailid = createTableID("sa_tpartreimbursementdetail", iteminfos.size());