行关闭冻结金额变更及送修单添加单价及bug修复

src/custom/beans/datatag/DataTag.java

@@ -60,7 +60,7 @@ public class DataTag {
         } else {
             sys_systemtagid = sys_systemtagRows.get(0).getLong("sys_systemtagid");
         }
-        Rows sys_systemtagdetailRows = controller.dbConnect.runSqlQuery("select * from sys_systemtagdetail where siteid='" + controller.siteid + "' issystem=1 and tag='" + tag + "'");
+        Rows sys_systemtagdetailRows = controller.dbConnect.runSqlQuery("select * from sys_systemtagdetail where siteid='" + controller.siteid + "' and issystem=1 and tag='" + tag + "'");
         if (sys_systemtagdetailRows.isEmpty()) {
             SQLFactory sqlFactory = new SQLFactory(new DataTag(), "新增系统标签");
             sqlFactory.addParameter("siteid", controller.siteid);

src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -1627,7 +1627,7 @@ public class Order extends Controller {
         insertSQL.setValue("billno", createBillCode("stockbill"));
 
         insertSQL.setValue("outplace", outplace);
-        insertSQL.setValue("delivery", orderRow.getString("delivery"));
+        insertSQL.setValue("delivery", "");
         insertSQL.setValue("logisticsmethod", orderRow.getString("logisticsmethod"));
         insertSQL.setValue("invoice_enterprisename", orderRow.getString("invoicename"));
         insertSQL.setValue("invoice_address", orderRow.getString("invoiceaddress"));

src/custom/restcontroller/webmanage/sale/order/OrderItems.java

@@ -1442,6 +1442,7 @@ public class OrderItems extends Controller {
             if (freezRow != null) {
                 BigDecimal amount = freezRow.getBigDecimal("amount");// 冻结金额
                 sqlList.add("update sa_accountbalance_freez set amount="+amount.subtract(returnamount)+" where sa_accountbalance_freezid="+freezRow.getLong("sa_accountbalance_freezid"));
+                sqlList.add("update sa_accountbalance set freezamount=freezamount-"+returnamount+" where sa_accountbalanceid="+freezRow.getLong("sa_accountbalanceid"));
 
                 if (amount.subtract(returnamount).compareTo(BigDecimal.ZERO)<=0) {
                     sqlList.add("delete from  sa_accountbalance_freez where sa_accountbalance_freezid="+freezRow.getLong("sa_accountbalance_freezid"));
@@ -1464,12 +1465,14 @@ public class OrderItems extends Controller {
                     frezzInsertSQL.setValue("createby", username);
                     frezzInsertSQL.setDateValue("createdate");
                     sqlList.add(frezzInsertSQL.getSQL());
+                    sqlList.add("update sa_accountbalance set freezamount=freezamount+"+returnamount+" where sa_accountbalanceid="+accountbalanceRows.get(0).getLong("sa_accountbalanceid"));
                 }else{
                     return getErrReturnObject().setErrMsg("账户不存在").toString();
                 }
             } else {
                 BigDecimal amount = freezRow.getBigDecimal("amount");// 冻结金额
                 sqlList.add("update sa_accountbalance_freez set amount="+amount.add(returnamount)+" where sa_accountbalance_freezid="+freezRow.getLong("sa_accountbalance_freezid"));
+                sqlList.add("update sa_accountbalance set freezamount=freezamount+"+returnamount+" where sa_accountbalanceid="+freezRow.getLong("sa_accountbalanceid"));
             }
             sqlList.add(DataContrlLog.createLog(this, "sa_order", sa_orderid, "反关闭", "行"+rowsdetails.toJsonArray("rowno")+"反关闭成功")
                     .getSQL());

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

@@ -84,6 +84,7 @@ public class sendrepair extends Controller {
         UpdateSQLdetail.setValue("agentcost", content.getBigDecimal("agentcost"));
         UpdateSQLdetail.setValue("logisticscost", content.getBigDecimal("logisticscost"));
         UpdateSQLdetail.setValue("logistics", content.getStringValue("logistics"));
+        UpdateSQLdetail.setValue("price", content.getStringValue("price"));
 
         UpdateSQLdetail.setValue("newitemid", content.getStringValue("newitemid"));
         UpdateSQLdetail.setValue("newitemno", content.getStringValue("newitemno"));
@@ -109,7 +110,7 @@ public class sendrepair extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t3", "t1.sys_enterpriseid = t3.sys_enterpriseid AND t1.siteid = t3.siteid","agentnum");
         querySQL.addJoinTable(JOINTYPE.left, "sa_sendrepair_detail", "t4", "t1.sa_sendrepairid = t4.sa_sendrepairid AND t1.siteid = t4.siteid","newspec","newitemno","newitemname",
                 "newitemid","newsku","agentcost","practicalamount","amount","logisticscost","logistics","idearemarks","disposition","demand","reason","duty",
-                "stockdate","enddate","phonenumber","name","qty","itemid","sku");
+                "stockdate","enddate","phonenumber","name","qty","itemid","sku","price");
         querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t5", "t5.itemid = t4.itemid AND t5.siteid = t4.siteid","itemname","itemno","spec","model");
         querySQL.addJoinTable(JOINTYPE.left, "plm_unit", "t6", "t5.unitid = t6.unitid AND t5.siteid = t6.siteid","unitname");
         querySQL.addQueryFields("remarksdetail","t4.remarks");
@@ -173,7 +174,7 @@ public class sendrepair extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t3", "t1.sys_enterpriseid = t3.sys_enterpriseid AND t1.siteid = t3.siteid","agentnum");
         querySQL.addJoinTable(JOINTYPE.left, "sa_sendrepair_detail", "t4", "t1.sa_sendrepairid = t4.sa_sendrepairid AND t1.siteid = t4.siteid","newspec","newitemno","newitemname",
                 "newitemid","newsku","agentcost","practicalamount","instockdate","amount","logisticscost","logistics","idearemarks","disposition","demand","reason","duty",
-                "stockdate","enddate","phonenumber","name","qty","itemid","sku");
+                "stockdate","enddate","phonenumber","name","qty","itemid","sku","price");
         querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t5", "t5.itemid = t4.itemid AND t5.siteid = t4.siteid","itemname","itemno","spec","model");
         querySQL.addJoinTable(JOINTYPE.left, "plm_unit", "t6", "t5.unitid = t6.unitid AND t5.siteid = t6.siteid","unitname");
         querySQL.addQueryFields("remarksdetail","t4.remarks");

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

@@ -317,6 +317,9 @@ public class stockbill extends Controller {
             if (whereObject.containsKey("paynocheck") && !"".equals(whereObject.getString("paynocheck"))) {
                 where.append(" and t1.status ='新建' and delivery='到付'");
             }
+            if (whereObject.containsKey("jfnocheck") && !"".equals(whereObject.getString("jfnocheck"))) {
+                where.append(" and t1.status ='新建' and delivery='寄付'");
+            }
         }
 
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "st_stockbill", "*").setTableAlias("t1");