货品档案及商户档案字段新增

src/custom/restcontroller/webmanage/sale/enterprise/SQL/商户档案修改.sql

@@ -17,6 +17,7 @@ set changeuserid=$changeuserid$,
     invoicingpoint=$invoicingpoint$,
     saleclassauth=$saleclassauth$,
     abbreviation=$abbreviation$,
-    grade = $grade$
+    grade = $grade$,
+    isorder=$isorder$
 where siteid = $siteid$
   and sys_enterpriseid = $sys_enterpriseid$

src/custom/restcontroller/webmanage/sale/enterprise/SQL/商户档案列表查询.sql

@@ -19,6 +19,7 @@ select t1.siteid,
        t1.invoicingpoint,
        t1.saleclassauth,
        t1.grade,
+       t1.isorder,
        t2.sa_customersid,
        t2.type,
        t3.agentnum,

src/custom/restcontroller/webmanage/sale/enterprise/SQL/商户档案新增.sql

@@ -1,6 +1,6 @@
 insert into sys_enterprise(siteid, sys_enterpriseid, createby, createdate, createuserid, authuserid, changeuserid,
                            changeby, changedate, city, county, address, phonenumber, province, contact, enterprisename,
-                           taxno,limitreturnday,freefreightamount,latitude,longitude,invoicingpoint,saleclassauth,grade)
+                           taxno,limitreturnday,freefreightamount,latitude,longitude,invoicingpoint,saleclassauth,grade,isorder)
 select $siteid$,
        $sys_enterpriseid$,
        $username$,
@@ -24,4 +24,5 @@ select $siteid$,
        $longitude$,
        $invoicingpoint$,
        $saleclassauth$,
-       $grade$
+       $grade$,
+       $isorder$

src/custom/restcontroller/webmanage/sale/enterprise/SQL/商户档案详情查询.sql

@@ -19,6 +19,7 @@ select t1.siteid,
        t1.invoicingpoint,
        t1.saleclassauth,
        t1.grade,
+       t1.isorder,
        t9.erpagentnum
 from sys_enterprise t1
          LEFT JOIN sys_dataextend t9 ON t1.sys_enterpriseid = t9.ownerid  and ownertable='sys_enterprise' and  t1.siteid = t9.siteid

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

@@ -22,6 +22,9 @@ SELECT t1.itemid,
        t1.length,
        t1.delivery,
        t1.istool,
+       t1.ismodule,
+       t1.packageqty,
+       t1.color,
        t6.auxunitid,
        t6.	unitgroupname,
        t7.unitname axunitname,

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

@@ -2,9 +2,9 @@ insert into plm_item (siteid, itemid, createby, createdate, changeuserid, change
                       isauxunit, unitgroupid, itemname, isonsale, status, model, spec, orderminqty, orderaddqty,
                       orderminqty_auxunit, orderaddqty_auxunit, remarks, barcode, skucontrol, batchcontrol, grossweight,
                       weight, height, width, length, delivery, istool, marketprice, standards, stockstatus2,
-                      stockstatus1, warrantyday, iswuliao, isservice)
+                      stockstatus1, warrantyday, iswuliao, isservice,color,packageqty,ismodule)
 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$,
         $weight$, $height$, $width$, $length$, $delivery$, $istool$, $marketprice$, $standards$,
-        $stockstatus2$, $stockstatus1$, $warrantyday$, $iswuliao$, $isservice$)
+        $stockstatus2$, $stockstatus1$, $warrantyday$, $iswuliao$, $isservice$,$color$,$packageqty$,$ismodule$)

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

@@ -31,6 +31,9 @@ SET changeuserid=$userid$,
     stockstatus1 = $stockstatus1$,
     warrantyday = $warrantyday$,
     iswuliao = $iswuliao$,
+    ismodule = $ismodule$,
+    color = $color$,
+    packageqty = $packageqty$,
     isservice = $isservice$
 WHERE itemid = $itemid$
   and siteid = $siteid$