ERP修改体积后需要同步至E-订单及工厂发退明细增加商品对应的领域字段并支持导出及账户流水导出增加分类和明细分类

src/custom/restcontroller/sale/cashbill/SQL/资金流水账查询导出.sql

@@ -4,10 +4,10 @@ select t1.billno,
        t4.accountname,
        t1.amount,
        ifnull(t1.balance,0) balance,
-       t1.remarks,
        t1.source,
-       t1.createby,
-       t1.createdate,
+       t1.class,
+       t1.subclass,
+       t1.remarks,
        t1.checkby,
        t1.checkdate 
 from sa_cashbill t1

src/custom/restcontroller/sale/cashbill/cashbill.java

@@ -888,8 +888,6 @@ public class cashbill extends Controller {
         if (isExport) {
             //去除不需要导出项
             rows.getFieldList().remove("sa_accountclassid");
-            rows.getFieldList().remove("createby");
-            rows.getFieldList().remove("createdate");
             Rows uploadRows = uploadExcelToObs("cashBill", "资金流水账列表", rows, getTitleMap());
             return getSucReturnObject().setData(uploadRows).toString();
         }
@@ -1110,9 +1108,12 @@ public class cashbill extends Controller {
         titleMap.put("amount", "收支金额");
         titleMap.put("balance", "账户结余");
         titleMap.put("source", "凭证来源");
+        titleMap.put("class", "分类");
+        titleMap.put("subclass", "分类明细");
+        titleMap.put("remarks", "备注");
         titleMap.put("checkby", "审核人");
         titleMap.put("checkdate", "审核时间");
-        titleMap.put("remarks", "备注");
+
         return titleMap;
     }
 }

src/custom/restcontroller/webmanage/sale/dispatch/SQL/工厂发货及退货明细(经销商).sql

@@ -14,7 +14,8 @@ select t.* from (SELECT t1.sa_dispatch_itemsid detailid,
        t5.price,
        cast((ifnull(t1.outwarehouseqty, 0) * t5.price) AS CHAR) amount,
 			 t2.packageqty,
-       t1.remarks
+       t1.remarks,
+			 t7.tradefield
 FROM sa_dispatch_items t1
          left join plm_item t2 on t1.itemid = t2.itemid and t1.siteid = t2.siteid
          LEFT JOIN plm_unit t3 ON t3.unitid = t2.unitid AND t3.siteid = t2.siteid
@@ -22,6 +23,7 @@ FROM sa_dispatch_items t1
          left join sa_orderitems t5 on t1.sa_orderitemsid = t5.sa_orderitemsid and t1.siteid = t5.siteid
          left join sa_order t8 on t8.sa_orderid=t5.sa_orderid and t8.siteid=t5.siteid
          left join plm_itemextend t6 on t2.siteid = t6.siteid and t2.itemid = t6.itemid
+         left join (select itemid,siteid,group_concat(tradefield) tradefield from  plm_item_tradefield group by itemid,siteid) t7 on t7.itemid=t1.itemid and t7.siteid=t1.siteid
 where t1.siteid = $siteid$ and t4.sys_enterpriseid=$sys_enterpriseid$ and ifnull(t1.outwarehouseqty, 0)>0
 union all
 SELECT t1.sa_aftersalesmag_itemsid detailid,
@@ -40,7 +42,8 @@ SELECT t1.sa_aftersalesmag_itemsid detailid,
        t1.price,
        t1.amount,
 			 t2.packageqty,
-       t1.reason remarks
+       t1.reason remarks,
+			 t7.tradefield
 FROM sa_aftersalesmag_items t1
          left join plm_item t2 on t1.itemid = t2.itemid and t1.siteid = t2.siteid
          LEFT JOIN plm_unit t3 ON t3.unitid = t2.unitid AND t3.siteid = t2.siteid
@@ -48,4 +51,5 @@ FROM sa_aftersalesmag_items t1
          left join sa_orderitems t5 on t1.sa_orderitemsid = t5.sa_orderitemsid and t1.siteid = t5.siteid
          left join sa_order t8 on t8.sa_orderid=t5.sa_orderid and t8.siteid=t5.siteid
          left join plm_itemextend t6 on t2.siteid = t6.siteid and t2.itemid = t6.itemid
+        left join (select itemid,siteid,group_concat(tradefield) tradefield from  plm_item_tradefield group by itemid,siteid) t7 on t7.itemid=t1.itemid and t7.siteid=t1.siteid
 where t1.siteid = $siteid$ and t4.type='退货单' and t4.status='复核' and t4.sys_enterpriseid=$sys_enterpriseid$) t where $where$

src/custom/restcontroller/webmanage/sale/dispatch/dispatchItems.java

@@ -487,6 +487,7 @@ public class dispatchItems extends Controller {
         titleMap.put("amount", "金额");
         titleMap.put("packageqty", "包装数量");
         titleMap.put("remarks", "备注");
+        titleMap.put("tradefield", "领域");
 
         return titleMap;
     }

src/custom/service/AutoDockItemService.java

@@ -153,7 +153,7 @@ public class AutoDockItemService extends ServiceController {
 
                 }else{
                    if(itemRowsMapAll.get(jsonObject.getString("fitemno")).get(0).getString("status").equals("新建")){
-                       sqlList.add("update plm_item set itemname='"+jsonObject.getString("fitemname")+"' where itemid="+itemRowsMapAll.get(jsonObject.getString("fitemno")).get(0).getLong("itemid"));
+                       sqlList.add("update plm_item set itemname='"+jsonObject.getString("fitemname")+"',volume='"+ jsonObject.getStringValue("fvolume")+"' where itemid="+itemRowsMapAll.get(jsonObject.getString("fitemno")).get(0).getLong("itemid"));
                    }
                 }