Merge remote-tracking branch 'origin/develop' into develop

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

@@ -2294,7 +2294,8 @@ public class Order extends Controller {
         Long pay_enterpriseid = row.getLong("pay_enterpriseid");
         if (pay_enterpriseid <= 0) {
             dbConnect.runSqlUpdate("UPDATE sa_order set pay_enterpriseid=sys_enterpriseid  WHERE sa_orderid=" + sa_orderid);
-//            return getErrReturnObject().setErrMsg("请选择结算企业").toString();
+            pay_enterpriseid=row.getLong("sys_enterpriseid");
+            //            return getErrReturnObject().setErrMsg("请选择结算企业").toString();
         }
         Long sys_enterprise_financeid = row.getLong("sys_enterprise_financeid");
         if (sys_enterprise_financeid <= 0) {
@@ -2666,18 +2667,21 @@ public class Order extends Controller {
             Accountbalance.remindSend(this, pay_enterpriseid, sa_cashbillid);
         }
         Rows agentrows = dbConnect.runSqlQuery("select submitautocheck from sa_agents where sys_enterpriseid=" + sys_enterpriseid);
+        if (!Accountbalance.judgeBalance(this, pay_enterpriseid, sa_accountclassid, amount)) {
 
+        }
         if (agentrows.isNotEmpty()) {
             if (agentrows.get(0).getBoolean("submitautocheck")) {
                 Rows orderRows = dbConnect.runSqlQuery("select * from sa_order where sa_orderid="+sa_orderid+" and ifnull(remarks,'')!=''");
                 Rows orderdetailsRows = dbConnect.runSqlQuery("select * from sa_orderitems where sa_orderid="+sa_orderid+" and ifnull(remarks,'')!=''");
                 if(amount.compareTo(BigDecimal.ZERO)>0){
                     if(orderRows.isEmpty() && orderdetailsRows.isEmpty()){
-                        String result = check();
-                        if(result.contains("成功")){
-                            dbConnect.runSqlUpdate("update sa_order set checkby='自动审核' where sa_orderid="+sa_orderid);
+                        if (Accountbalance.judgeBalance(this, pay_enterpriseid, sa_accountclassid, amount)) {
+                            String result = check();
+                            if(result.contains("成功")){
+                                dbConnect.runSqlUpdate("update sa_order set checkby='自动审核' where sa_orderid="+sa_orderid);
+                            }
                         }
-
                     }
                 }
 

src/custom/restcontroller/webmanage/sale/sendplan/SQL/销售出库单明细新增.sql

@@ -1,4 +1,4 @@
-insert into st_stockbill_items (siteid, st_stockbill_itemsid,st_stockbillid, sa_dispatch_itemsid, rowno, itemid, qty,amount,remarks,price,sa_orderitemsid,sa_orderid,defaultprice,stockid,custamount,itemno,itemname,model)
+insert into st_stockbill_items (siteid, st_stockbill_itemsid,st_stockbillid, sa_dispatch_itemsid, rowno, itemid, qty,amount,remarks,price,sa_orderitemsid,sa_orderid,defaultprice,stockid,custamount,itemno,itemname,model,skucontrol)
 select $siteid$,
        $st_stockbill_itemsid$,
        $st_stockbillid$,
@@ -16,4 +16,5 @@ select $siteid$,
        $custamount$,
        $itemno$,
        $itemname$,
-       $model$
+       $model$,
+       $skucontrol$

src/custom/restcontroller/webmanage/sale/sendplan/sendplandetail.java

@@ -434,6 +434,7 @@ public class sendplandetail extends Controller {
                     sqlFactorydetail.addParameter("itemname", itemRowsMap.containsKey(jsonObject.getStringValue("itemid"))?itemRowsMap.get(jsonObject.getStringValue("itemid")).get(0).getString("itemname"):jsonObject.getStringValue("itemname"));
                     sqlFactorydetail.addParameter("itemno", itemRowsMap.containsKey(jsonObject.getStringValue("itemid"))?itemRowsMap.get(jsonObject.getStringValue("itemid")).get(0).getString("itemno"):jsonObject.getStringValue("itemno"));
                     sqlFactorydetail.addParameter("model", itemRowsMap.containsKey(jsonObject.getStringValue("itemid"))?itemRowsMap.get(jsonObject.getStringValue("itemid")).get(0).getString("model"):jsonObject.getStringValue("model"));
+                    sqlFactorydetail.addParameter("skucontrol", itemRowsMap.containsKey(jsonObject.getStringValue("itemid"))?itemRowsMap.get(jsonObject.getStringValue("itemid")).get(0).getLong("skucontrol"):jsonObject.getLongValue("skucontrol"));
 
                     sqlFactorydetail.addParameter("qty", qty);
                     sqlFactorydetail.addParameter("sa_dispatch_itemsid", 0);

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

@@ -10,6 +10,7 @@ import common.annotation.API;
 import common.annotation.CACHEING;
 import common.annotation.CACHEING_CLEAN;
 import common.data.*;
+import org.apache.commons.lang.StringUtils;
 import restcontroller.R;
 
 import java.util.ArrayList;
@@ -189,6 +190,10 @@ public class u8prodprice extends Controller {
                     return getErrReturnObject().setErrMsg("非审核状态的【"+row.getString("billno")+"】u8产品入库成本导入表无法反审核")
                             .toString();
                 }
+                if (StringUtils.isNotBlank(row.getString("uploaddate"))) {
+                    return getErrReturnObject().setErrMsg("已上传的【"+row.getString("billno")+"】u8产品入库成本导入表无法反审核")
+                            .toString();
+                }
             }
 
         }

src/custom/service/AutoCreateU8prodprice.java

@@ -0,0 +1,43 @@
+package service;
+
+import common.ServiceController;
+import common.data.Row;
+import common.data.Rows;
+import common.data.SQLFactory;
+import common.data.UpdateSQL;
+import common.data.db.DBConnect;
+
+import java.util.ArrayList;
+
+public class AutoCreateU8prodprice extends ServiceController {
+    @Override
+    public void serviceRun() throws Exception {
+        DBConnect u8dbConnect = new DBConnect("U8");
+        ArrayList<String> sa_u8prodpriceids =new ArrayList<>();
+        SQLFactory u8cprksqlFactory = new SQLFactory(this, "u8产品入库");
+        Rows cprkrows = dbConnect.runSqlQuery(u8cprksqlFactory.getSQL());
+        ArrayList<String> sqlList = new ArrayList<>();
+        if(cprkrows.isEmpty()){
+            for(Row row :cprkrows){
+                sqlList.add(row.getString("sqlstr"));
+            }
+        }
+        SQLFactory u8wwrksqlFactory = new SQLFactory(this, "u8委外入库");
+        Rows wwrkrows = dbConnect.runSqlQuery(u8wwrksqlFactory.getSQL());
+        if(wwrkrows.isEmpty()){
+            for(Row row :wwrkrows){
+                sqlList.add(row.getString("sqlstr"));
+            }
+        }
+
+        u8dbConnect.runSqlUpdate(sqlList);
+
+        sa_u8prodpriceids.addAll(cprkrows.toArrayList("sa_u8prodpriceid"));
+        sa_u8prodpriceids.addAll(wwrkrows.toArrayList("sa_u8prodpriceid"));
+        UpdateSQL updateSQL = SQLFactory.createUpdateSQL(dbConnect, "sa_u8prodprice");
+        updateSQL.setDateValue("uploaddate");
+        updateSQL.setWhere("sa_u8prodpriceid", sa_u8prodpriceids);
+        dbConnect.runSqlUpdate(updateSQL.getSQL());
+
+    }
+}

src/custom/service/SQL/u8产品入库.sql

@@ -0,0 +1,46 @@
+SELECT
+    sa_u8prodpriceid,
+    sqlstr
+FROM (
+         SELECT
+             t1.sa_u8prodpriceid,
+             CONCAT(
+                     'update rdrecords10 b ',
+                     'join rdrecord10 h on b.ID = h.ID ',
+                     'set b.iUnitCost = ', t2.costprice, ' ',
+                     'where h.dDate >= ''', DATE_FORMAT(t1.begindate, '%Y-%m-%d'), ''' ',
+                     'and h.dDate <= ''', DATE_FORMAT(t1.enddate, '%Y-%m-%d'), ''' ',
+                     'and h.cWhCode = ''', IFNULL(t2.stockno, ''), ''' ',
+                     'and b.cinvcode = ''', t2.itemno, ''''
+             ) AS sqlstr
+         FROM
+             sa_u8prodprice AS t1
+                 INNER JOIN
+             sa_u8prodprice_datail AS t2
+             ON t1.sa_u8prodpriceid = t2.sa_u8prodpriceid
+         WHERE
+             t1.status = '审核'
+           AND t1.type = '产品入库'
+
+         UNION ALL
+
+         SELECT
+             t1.sa_u8prodpriceid,
+             CONCAT(
+                     'update rdrecords10 b ',
+                     'join rdrecord10 h on b.ID = h.ID ',
+                     'set b.iPrice = b.iUnitCost * b.iQuantity ',
+                     'where h.dDate >= ''', DATE_FORMAT(t1.begindate, '%Y-%m-%d'), ''' ',
+                     'and h.dDate <= ''', DATE_FORMAT(t1.enddate, '%Y-%m-%d'), ''' ',
+                     'and h.cWhCode = ''', IFNULL(t2.stockno, ''), ''' ',
+                     'and b.cinvcode = ''', t2.itemno, ''''
+             ) AS sqlstr
+         FROM
+             sa_u8prodprice AS t1
+                 INNER JOIN
+             sa_u8prodprice_datail AS t2
+             ON t1.sa_u8prodpriceid = t2.sa_u8prodpriceid
+         WHERE
+             t1.status = '审核'
+           AND t1.type = '产品入库'
+     ) AS t;

src/custom/service/SQL/u8委外入库.sql

@@ -0,0 +1,44 @@
+SELECT
+    t1.sa_u8prodpriceid,
+    CONCAT(
+            'UPDATE rdrecords01 b ',
+            'INNER JOIN rdrecord01 h ON b.ID = h.ID ',
+            'SET ',
+            'b.iOriTaxCost = ', t2.costprice * (100 + IFNULL(t2.taxrate, 0)) / 100,
+            ', ',
+            'b.iTaxRate = ', IFNULL(t2.taxrate, 0),
+            ', ',
+            'b.iUnitCost = ', t2.costprice,
+            ', ',
+            'b.iOriCost = ', t2.costprice,
+            ', ',
+            'b.fACost = ', t2.costprice,
+            ', ',
+            'b.iPrice = ', t2.costprice, ' * b.iQuantity',
+            ', ',
+            'b.iAPrice = ', t2.costprice, ' * b.iQuantity',
+            ', ',
+            'b.iOriMoney = ', t2.costprice, ' * b.iQuantity',
+            ', ',
+            'b.iTaxPrice = ', t2.costprice * IFNULL(t2.taxrate, 0) / 100, ' * b.iQuantity',
+            ', ',
+            'b.iOriTaxPrice = ', t2.costprice * IFNULL(t2.taxrate, 0) / 100, ' * b.iQuantity',
+            ', ',
+            'b.ioriSum = ', t2.costprice, ' * b.iQuantity + ', t2.costprice * IFNULL(t2.taxrate, 0) / 100, ' * b.iQuantity',
+            ', ',
+            'b.iSum = ', t2.costprice, ' * b.iQuantity + ', t2.costprice * IFNULL(t2.taxrate, 0) / 100, ' * b.iQuantity',
+            ' ',
+            'WHERE h.cBusType = ''委外加工'' ',
+            'AND h.dDate >= ''', DATE_FORMAT(t1.begindate, '%Y-%m-%d'), ''' ',
+            'AND h.dDate <= ''', DATE_FORMAT(t1.enddate, '%Y-%m-%d'), ''' ',
+            'AND h.cWhCode = ''', IFNULL(t2.stockno, ''), ''' ',
+            'AND b.cinvcode = ''', t2.itemno, ''''
+    ) AS sqlstr
+FROM
+    sa_u8prodprice AS t1
+        INNER JOIN
+    sa_u8prodprice_datail AS t2
+    ON t1.sa_u8prodpriceid = t2.sa_u8prodpriceid
+WHERE
+    t1.status = '审核'
+  AND t1.type = '委外入库';