售出库单金额相关操作加操作记录

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

@@ -129,7 +129,7 @@ public class stockbill extends Controller {
             sqlList.add(DataContrlLog.createLog(this, "st_stockbill", st_stockbillid, "新增", "销售出库单新增成功").getSQL());
         } else {
             Rows rows = dbConnect.runSqlQuery(
-                    "SELECT status,sys_enterpriseid from st_stockbill WHERE st_stockbillid = "
+                    "SELECT status,sys_enterpriseid,paydiscountamount,payamount from st_stockbill WHERE st_stockbillid = "
                             + st_stockbillid);
             if (rows.isNotEmpty()) {
                 if (rows.get(0).getString("status").equals("新建")) {
@@ -160,6 +160,11 @@ public class stockbill extends Controller {
                     updateSQL.setDateValue("changedate");
                     sqlList.add(updateSQL.getSQL());
 
+                    if(content.getBigDecimal("payamount").compareTo(rows.get(0).getBigDecimal("payamount"))!=0
+                            || content.getBigDecimal("paydiscountamount").compareTo(rows.get(0).getBigDecimal("paydiscountamount"))!=0){
+                        sqlList.add(DataContrlLog.createLog(this, "st_stockbill", st_stockbillid, "金额更新变更", "销售出库单更支付金额:"+content.getBigDecimal("payamount")+"，优惠金额:"+content.getBigDecimal("paydiscountamount")).getSQL());
+                    }
+
                     sqlList.add(DataContrlLog.createLog(this, "st_stockbill", st_stockbillid, "更新", "销售出库单更新成功").getSQL());
                 } else {
                     return getErrReturnObject().setErrMsg("非新建状态下无法编辑").toString();

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

@@ -3,6 +3,7 @@ package restcontroller.webmanage.sale.stockbill;
 import beans.brand.Brand;
 import beans.customscheme.CustomScheme;
 import beans.data.BatchDeleteErr;
+import beans.datacontrllog.DataContrlLog;
 import beans.itemprice.ItemPrice;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
@@ -157,9 +158,13 @@ public class stockbillitems extends Controller {
         long[] st_stockbill_itemsid = createTableID("st_stockbill_items", iteminfos.size());
         Rows maxidRows = dbConnect
                 .runSqlQuery("select MAX(rowno) rowno from st_stockbill_items where st_stockbillid=" + st_stockbillid);
+        Rows detailRows = dbConnect
+                .runSqlQuery("select rowno,price,defaultprice,discountrate,st_stockbill_itemsid from st_stockbill_items where st_stockbillid=" + st_stockbillid);
+        RowsMap detailRowsMap = detailRows.toRowsMap("st_stockbill_itemsid");
         if (!maxidRows.isEmpty()) {
             maxid = maxidRows.get(0).getLong("rowno");
         }
+
         for (Object obj : iteminfos) {
             JSONObject iteminfo = (JSONObject) obj;
             if (iteminfo.getLong("st_stockbill_itemsid") <= 0 || dbConnect
@@ -217,6 +222,14 @@ public class stockbillitems extends Controller {
                         updateSQL.setValue("batchno", iteminfo.getString("batchno"));
                         updateSQL.setValue("stockid", iteminfo.getString("stockid"));
                         updateSQL.setValue("skucontrol", iteminfo.getBoolean("skucontrol"));
+                        if(detailRowsMap.containsKey(iteminfo.getString("st_stockbill_itemsid"))){
+                            if(iteminfo.getBigDecimal("discountrate").compareTo(detailRowsMap.get(iteminfo.getString("st_stockbill_itemsid")).get(0).getBigDecimal("discountrate"))!=0
+                                    || iteminfo.getBigDecimal("defaultprice").compareTo(detailRowsMap.get(iteminfo.getString("st_stockbill_itemsid")).get(0).getBigDecimal("defaultprice"))!=0
+                                    || iteminfo.getBigDecimal("price").compareTo(detailRowsMap.get(iteminfo.getString("st_stockbill_itemsid")).get(0).getBigDecimal("price"))!=0){
+                                sqlList.add(DataContrlLog.createLog(this, "st_stockbill", st_stockbillid, "明细金额变更", "行号【"+detailRowsMap.get(iteminfo.getString("st_stockbill_itemsid")).get(0).getString("rowno")+"】原价:"+iteminfo.getBigDecimal("defaultprice")+"，折后价:"+iteminfo.getBigDecimal("price")+",折扣率:"+iteminfo.getBigDecimal("discountrate")).getSQL());
+                            }
+                        }
+
                         sqlList.add(updateSQL.getSQL());
                     } else {
                         return getErrReturnObject().setErrMsg("非新建状态下无法编辑").toString();

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

@@ -45,7 +45,7 @@ public class warrantycard extends Controller {
                 where.append(" and t1.sku ='" + whereObject.getString("sku") + "' ");
             }
         }
-
+        pageSorting="t1.begdate desc";
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_warrantycard", "*");
         querySQL.setAsyncRowCount(true);//设置为延迟查询总行数
         querySQL.setTableAlias("t1");
@@ -57,12 +57,12 @@ public class warrantycard extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t7", "t7.sys_enterpriseid = t6.sys_enterpriseid AND t7.siteid = t6.siteid");
         querySQL.addQueryFields("toabbreviation","t7.abbreviation");
         querySQL.addQueryFields("toenterprisename","t7.enterprisename");
-
         querySQL.setSiteid(siteid);
         querySQL.setWhere(where.toString());
         querySQL.setPage(pageSize, pageNumber);
         Rows rows = querySQL.query();
 
+
         QuerySQL tradefieldQuery = SQLFactory.createQuerySQL(this, "sys_enterprise_tradefield", "sys_enterpriseid");
         tradefieldQuery.addQueryFields("sa_saleareaid", "max(sa_saleareaid)");
         tradefieldQuery.setWhere("sys_enterpriseid", rows.toArrayList("sys_enterpriseid"));

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

@@ -440,6 +440,7 @@ public class workorder extends Controller {
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sys_site_parameter", "sys_site_parameterid");
         querySQL.setTableAlias("t0");
         querySQL.addJoinTable(JOINTYPE.right, sqlFactory, "t1", "t0.siteid='111'", "*");
+        pageSorting="t1.createdate desc";
         querySQL.setPage(pageSize, pageNumber);
         Rows rows = querySQL.query();
         SQLFactory sqlFactory2 = new SQLFactory(this, "服务工单状态统计");