发货单审核复核变为一个接口

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

@@ -315,101 +315,101 @@ public class dispatch extends Controller {
 
     }
 
-    @API(title = "审核", apiversion = R.ID20221114135603.v1.class)
-    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, dispatch.class, dispatchItems.class,cashbill.class})
-    public String check() throws YosException {
-        Long sa_dispatchid = content.getLong("sa_dispatchid");
-        Long sa_orderid = 0L;
-        Rows rows = dbConnect.runSqlQuery("select sa_dispatchid,status,billno,sa_orderid from sa_dispatch where sa_dispatchid ='"
-                + sa_dispatchid + "' and  siteid='" + siteid + "'");
-        if (rows.isEmpty()) {
-            return getErrReturnObject().setErrMsg("该发货单不存在")
-                    .toString();
-        } else {
-            sa_orderid = rows.get(0).getLong("sa_orderid");
-            if (!rows.get(0).getString("status").equals("新建")) {
-                return getErrReturnObject().setErrMsg("单号为：【" + rows.get(0).getString("billno") + "】的发货单为非新建状态，无法审核")
-                        .toString();
-            }
-        }
-
-        ArrayList<String> sqlList = new ArrayList<>();
-        Rows rowsOrderDetail = dbConnect.runSqlQuery("select t1.undeliqty,t1.deliedqty,t1.qty,t1.sa_orderitemsid from sa_orderitems t1 where t1.sa_orderitemsid in (select sa_orderitemsid from sa_dispatch_items where sa_dispatchid="+ sa_dispatchid+")" );
-        RowsMap rowsMap = rowsOrderDetail.toRowsMap("sa_orderitemsid");
-        Rows rowsDispatchDetail = dbConnect.runSqlQuery("select t1.qty,t1.sa_orderitemsid,t1.rowno,t2.itemname from sa_dispatch_items t1 left join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid  where t1.sa_dispatchid=" + sa_dispatchid);
-        if (!rowsDispatchDetail.isEmpty()) {
-            for (Row row : rowsDispatchDetail) {
-                if (rowsMap.get(row.getString("sa_orderitemsid")).isEmpty()) {
-                    return getErrReturnObject().setErrMsg("行号为：【" + row.getString("rowno") + "】的发货单明细不存在对应得订单行，无法审核")
-                            .toString();
-                }
-                if (row.getBigDecimal("qty").compareTo(rowsMap.get(row.getString("sa_orderitemsid")).get(0).getBigDecimal("undeliqty")) == 1) {
-                    return getErrReturnObject().setErrMsg("行号为：【" + row.getString("rowno") + "】的发货单明细的数量大于对应订单行的未发货数量，无法审核")
-                            .toString();
-                }
-                sqlList.add("update sa_orderitems set undeliqty=" + rowsMap.get(row.getLong("sa_orderitemsid")).get(0).getBigDecimal("undeliqty").subtract(row.getBigDecimal("qty")) + ",deliedqty=" + (row.getBigDecimal("qty").add(rowsMap.get(row.getLong("sa_orderitemsid")).get(0).getBigDecimal("deliedqty"))) + " where sa_orderitemsid=" + row.getLong("sa_orderitemsid"));
-            }
-        }
-        SQLFactory sqlFactoryupdate = new SQLFactory(this, "发货单审核");
-        sqlFactoryupdate.addParameter("siteid", siteid);
-        sqlFactoryupdate.addParameter("sa_dispatchid", sa_dispatchid);
-        sqlFactoryupdate.addParameter("checkby", username);
-        sqlList.add(sqlFactoryupdate.getSQL());
-        sqlList.add(DataContrlLog.createLog(this, "sa_dispatch", sa_dispatchid, "审核", "发货单审核成功").getSQL());
-        dbConnect.runSqlUpdate(sqlList);
-
-
-        Executor.sendEml(this, "dispatchrecheck", sa_dispatchid,new ArrayList<>());
-        return getSucReturnObject().toString();
-
-    }
-
-
-    @API(title = "反审核", apiversion = R.ID20221114135703.v1.class)
-    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, dispatch.class, dispatchItems.class, cashbill.class})
-    public String uncheck() throws YosException {
-        Long sa_dispatchid = content.getLong("sa_dispatchid");
-        Long sa_orderid = 0L;
-        Rows rows = dbConnect.runSqlQuery("select sa_dispatchid,status,billno,sa_orderid from sa_dispatch where sa_dispatchid ='"
-                + sa_dispatchid + "' and  siteid='" + siteid + "'");
-        if (rows.isEmpty()) {
-            return getErrReturnObject().setErrMsg("该发货单不存在")
-                    .toString();
-        } else {
-            sa_orderid = rows.get(0).getLong("sa_orderid");
-            if (!rows.get(0).getString("status").equals("审核")) {
-                return getErrReturnObject().setErrMsg("单号为：【" + rows.get(0).getString("billno") + "】的发货单为非审核状态，无法反审核")
-                        .toString();
-            }
-        }
-
-        ArrayList<String> sqlList = new ArrayList<>();
-
-        Rows rowsOrderDetail = dbConnect.runSqlQuery("select t1.undeliqty,t1.deliedqty,t1.qty,t1.sa_orderitemsid from sa_orderitems t1 where t1.sa_orderitemsid in (select sa_orderitemsid from sa_dispatch_items where sa_dispatchid="+ sa_dispatchid+")" );
-        RowsMap rowsMap = rowsOrderDetail.toRowsMap("sa_orderitemsid");
-        Rows rowsDispatchDetail = dbConnect.runSqlQuery("select t1.qty,t1.sa_orderitemsid,t1.rowno,t2.itemname from sa_dispatch_items t1 left join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid  where t1.sa_dispatchid=" + sa_dispatchid);
-        if (!rowsDispatchDetail.isEmpty()) {
-            for (Row row : rowsDispatchDetail) {
-//				if(rowsMap.get(row.getLong("sa_orderitemsid")).isEmpty()) {
-//					return getErrReturnObject().setErrMsg("行号为：【" + row.getString("rowno") + "】的发货单明细不存在对应得订单行，无法审核")
-//							.toString();
-//				}
-//				if(row.getBigDecimal("qty").compareTo(rowsMap.get(row.getLong("sa_orderitemsid")).get(0).getBigDecimal("undeliqty"))==1) {
-//					return getErrReturnObject().setErrMsg("行号为：【" + row.getString("rowno") + "】的发货单明细的数量大于对应订单行的未发货数量，无法审核")
-//							.toString();
-//				}
-                sqlList.add("update sa_orderitems set undeliqty=" + rowsMap.get(row.getLong("sa_orderitemsid")).get(0).getBigDecimal("undeliqty").add(row.getBigDecimal("qty")) + ",deliedqty=" + rowsMap.get(row.getLong("sa_orderitemsid")).get(0).getBigDecimal("deliedqty").subtract(row.getBigDecimal("qty")) + " where sa_orderitemsid=" + row.getLong("sa_orderitemsid"));
-            }
-        }
-        SQLFactory sqlFactoryupdate = new SQLFactory(this, "发货单反审核");
-        sqlFactoryupdate.addParameter("siteid", siteid);
-        sqlFactoryupdate.addParameter("sa_dispatchid", sa_dispatchid);
-        sqlFactoryupdate.addParameter("checkby", username);
-        sqlList.add(sqlFactoryupdate.getSQL());
-        sqlList.add(DataContrlLog.createLog(this, "sa_dispatch", sa_dispatchid, "反审核", "发货单反审核成功").getSQL());
-        dbConnect.runSqlUpdate(sqlList);
-        return getSucReturnObject().toString();
-    }
+//    @API(title = "审核", apiversion = R.ID20221114135603.v1.class)
+//    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, dispatch.class, dispatchItems.class,cashbill.class})
+//    public String check() throws YosException {
+//        Long sa_dispatchid = content.getLong("sa_dispatchid");
+//        Long sa_orderid = 0L;
+//        Rows rows = dbConnect.runSqlQuery("select sa_dispatchid,status,billno,sa_orderid from sa_dispatch where sa_dispatchid ='"
+//                + sa_dispatchid + "' and  siteid='" + siteid + "'");
+//        if (rows.isEmpty()) {
+//            return getErrReturnObject().setErrMsg("该发货单不存在")
+//                    .toString();
+//        } else {
+//            sa_orderid = rows.get(0).getLong("sa_orderid");
+//            if (!rows.get(0).getString("status").equals("新建")) {
+//                return getErrReturnObject().setErrMsg("单号为：【" + rows.get(0).getString("billno") + "】的发货单为非新建状态，无法审核")
+//                        .toString();
+//            }
+//        }
+//
+//        ArrayList<String> sqlList = new ArrayList<>();
+//        Rows rowsOrderDetail = dbConnect.runSqlQuery("select t1.undeliqty,t1.deliedqty,t1.qty,t1.sa_orderitemsid from sa_orderitems t1 where t1.sa_orderitemsid in (select sa_orderitemsid from sa_dispatch_items where sa_dispatchid="+ sa_dispatchid+")" );
+//        RowsMap rowsMap = rowsOrderDetail.toRowsMap("sa_orderitemsid");
+//        Rows rowsDispatchDetail = dbConnect.runSqlQuery("select t1.qty,t1.sa_orderitemsid,t1.rowno,t2.itemname from sa_dispatch_items t1 left join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid  where t1.sa_dispatchid=" + sa_dispatchid);
+//        if (!rowsDispatchDetail.isEmpty()) {
+//            for (Row row : rowsDispatchDetail) {
+//                if (rowsMap.get(row.getString("sa_orderitemsid")).isEmpty()) {
+//                    return getErrReturnObject().setErrMsg("行号为：【" + row.getString("rowno") + "】的发货单明细不存在对应得订单行，无法审核")
+//                            .toString();
+//                }
+//                if (row.getBigDecimal("qty").compareTo(rowsMap.get(row.getString("sa_orderitemsid")).get(0).getBigDecimal("undeliqty")) == 1) {
+//                    return getErrReturnObject().setErrMsg("行号为：【" + row.getString("rowno") + "】的发货单明细的数量大于对应订单行的未发货数量，无法审核")
+//                            .toString();
+//                }
+//                sqlList.add("update sa_orderitems set undeliqty=" + rowsMap.get(row.getLong("sa_orderitemsid")).get(0).getBigDecimal("undeliqty").subtract(row.getBigDecimal("qty")) + ",deliedqty=" + (row.getBigDecimal("qty").add(rowsMap.get(row.getLong("sa_orderitemsid")).get(0).getBigDecimal("deliedqty"))) + " where sa_orderitemsid=" + row.getLong("sa_orderitemsid"));
+//            }
+//        }
+//        SQLFactory sqlFactoryupdate = new SQLFactory(this, "发货单审核");
+//        sqlFactoryupdate.addParameter("siteid", siteid);
+//        sqlFactoryupdate.addParameter("sa_dispatchid", sa_dispatchid);
+//        sqlFactoryupdate.addParameter("checkby", username);
+//        sqlList.add(sqlFactoryupdate.getSQL());
+//        sqlList.add(DataContrlLog.createLog(this, "sa_dispatch", sa_dispatchid, "审核", "发货单审核成功").getSQL());
+//        dbConnect.runSqlUpdate(sqlList);
+//
+//
+//        Executor.sendEml(this, "dispatchrecheck", sa_dispatchid,new ArrayList<>());
+//        return getSucReturnObject().toString();
+//
+//    }
+//
+//
+//    @API(title = "反审核", apiversion = R.ID20221114135703.v1.class)
+//    @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, dispatch.class, dispatchItems.class, cashbill.class})
+//    public String uncheck() throws YosException {
+//        Long sa_dispatchid = content.getLong("sa_dispatchid");
+//        Long sa_orderid = 0L;
+//        Rows rows = dbConnect.runSqlQuery("select sa_dispatchid,status,billno,sa_orderid from sa_dispatch where sa_dispatchid ='"
+//                + sa_dispatchid + "' and  siteid='" + siteid + "'");
+//        if (rows.isEmpty()) {
+//            return getErrReturnObject().setErrMsg("该发货单不存在")
+//                    .toString();
+//        } else {
+//            sa_orderid = rows.get(0).getLong("sa_orderid");
+//            if (!rows.get(0).getString("status").equals("审核")) {
+//                return getErrReturnObject().setErrMsg("单号为：【" + rows.get(0).getString("billno") + "】的发货单为非审核状态，无法反审核")
+//                        .toString();
+//            }
+//        }
+//
+//        ArrayList<String> sqlList = new ArrayList<>();
+//
+//        Rows rowsOrderDetail = dbConnect.runSqlQuery("select t1.undeliqty,t1.deliedqty,t1.qty,t1.sa_orderitemsid from sa_orderitems t1 where t1.sa_orderitemsid in (select sa_orderitemsid from sa_dispatch_items where sa_dispatchid="+ sa_dispatchid+")" );
+//        RowsMap rowsMap = rowsOrderDetail.toRowsMap("sa_orderitemsid");
+//        Rows rowsDispatchDetail = dbConnect.runSqlQuery("select t1.qty,t1.sa_orderitemsid,t1.rowno,t2.itemname from sa_dispatch_items t1 left join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid  where t1.sa_dispatchid=" + sa_dispatchid);
+//        if (!rowsDispatchDetail.isEmpty()) {
+//            for (Row row : rowsDispatchDetail) {
+////				if(rowsMap.get(row.getLong("sa_orderitemsid")).isEmpty()) {
+////					return getErrReturnObject().setErrMsg("行号为：【" + row.getString("rowno") + "】的发货单明细不存在对应得订单行，无法审核")
+////							.toString();
+////				}
+////				if(row.getBigDecimal("qty").compareTo(rowsMap.get(row.getLong("sa_orderitemsid")).get(0).getBigDecimal("undeliqty"))==1) {
+////					return getErrReturnObject().setErrMsg("行号为：【" + row.getString("rowno") + "】的发货单明细的数量大于对应订单行的未发货数量，无法审核")
+////							.toString();
+////				}
+//                sqlList.add("update sa_orderitems set undeliqty=" + rowsMap.get(row.getLong("sa_orderitemsid")).get(0).getBigDecimal("undeliqty").add(row.getBigDecimal("qty")) + ",deliedqty=" + rowsMap.get(row.getLong("sa_orderitemsid")).get(0).getBigDecimal("deliedqty").subtract(row.getBigDecimal("qty")) + " where sa_orderitemsid=" + row.getLong("sa_orderitemsid"));
+//            }
+//        }
+//        SQLFactory sqlFactoryupdate = new SQLFactory(this, "发货单反审核");
+//        sqlFactoryupdate.addParameter("siteid", siteid);
+//        sqlFactoryupdate.addParameter("sa_dispatchid", sa_dispatchid);
+//        sqlFactoryupdate.addParameter("checkby", username);
+//        sqlList.add(sqlFactoryupdate.getSQL());
+//        sqlList.add(DataContrlLog.createLog(this, "sa_dispatch", sa_dispatchid, "反审核", "发货单反审核成功").getSQL());
+//        dbConnect.runSqlUpdate(sqlList);
+//        return getSucReturnObject().toString();
+//    }
 
 
     @API(title = "手工关闭", apiversion = R.ID20230404134703.v1.class)
@@ -514,46 +514,60 @@ public class dispatch extends Controller {
         return getSucReturnObject().toString();
     }
 
-    @API(title = "复核反复核", apiversion = R.ID20221114135803.v1.class)
+    @API(title = "复核", apiversion = R.ID20221114135803.v1.class)
     @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, dispatch.class, dispatchItems.class,cashbill.class})
     public String recheck() throws YosException {
         Long sa_dispatchid = content.getLong("sa_dispatchid");
-        boolean isrecheck = content.getBooleanValue("isrecheck");
-        Rows rows = dbConnect.runSqlQuery("select t1.*,t3.agentnum,t2.enterprisename,t4.sonum,t5.name,t5.phonenumber,t5.address from sa_dispatch t1 left join sys_enterprise t2  on t1.sys_enterpriseid=t2.sys_enterpriseid and t1.siteid=t2.siteid left join sa_agents t3 on t1.sys_enterpriseid=t3.sys_enterpriseid and t1.siteid=t3.siteid left join sa_order t4 on t1.sa_orderid=t4.sa_orderid and t1.siteid=t4.siteid left join sys_enterprise_contacts t5 on t1.rec_contactsid=t5.contactsid and t1.siteid=t5.siteid where t1.sa_dispatchid ='"
-                + sa_dispatchid + "' and  t1.siteid='" + siteid + "'");
-        Rows rowsdetail = dbConnect.runSqlQuery("select t3.sonum,t2.rowno sorowno,t4.itemno,t1.batchno,t1.rowno,t1.qty,t2.price,t1.remarks from sa_dispatch_items t1 left join sa_orderitems t2 on t1.sa_orderitemsid=t2.sa_orderitemsid and t1.siteid=t2.siteid left join sa_order t3 on t2.sa_orderid=t3.sa_orderid and t2.siteid=t3.siteid left join plm_item t4 on t1.itemid=t4.itemid and t1.siteid=t4.siteid  where t1.sa_dispatchid ='"
-                + sa_dispatchid + "' and  t1.siteid='" + siteid + "'");
-        for (Row row : rows) {
-            if (isrecheck) {
-                if (!row.getString("status").equals("审核")) {
-                    return getErrReturnObject().setErrMsg("单号为：【" + row.getString("billno") + "】的发货单为非审核状态，无法复核")
+        Rows dispatchRows = dbConnect.runSqlQuery("select sa_dispatchid,status,billno,sa_orderid from sa_dispatch where sa_dispatchid ='"
+                + sa_dispatchid + "' and  siteid='" + siteid + "'");
+        if (dispatchRows.isEmpty()) {
+            return getErrReturnObject().setErrMsg("该发货单不存在")
+                    .toString();
+        } else {
+            if (!dispatchRows.get(0).getString("status").equals("新建")) {
+                return getErrReturnObject().setErrMsg("单号为：【" + dispatchRows.get(0).getString("billno") + "】的发货单为非新建状态，无法复核")
+                        .toString();
+            }
+        }
+
+        ArrayList<String> sqlList = new ArrayList<>();
+        Rows rowsOrderDetail = dbConnect.runSqlQuery("select t1.undeliqty,t1.deliedqty,t1.qty,t1.sa_orderitemsid from sa_orderitems t1 where t1.sa_orderitemsid in (select sa_orderitemsid from sa_dispatch_items where sa_dispatchid="+ sa_dispatchid+")" );
+        RowsMap rowsMap = rowsOrderDetail.toRowsMap("sa_orderitemsid");
+        Rows rowsDispatchDetail = dbConnect.runSqlQuery("select t1.qty,t1.sa_orderitemsid,t1.rowno,t2.itemname from sa_dispatch_items t1 left join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid  where t1.sa_dispatchid=" + sa_dispatchid);
+        if (!rowsDispatchDetail.isEmpty()) {
+            for (Row row : rowsDispatchDetail) {
+                if (rowsMap.get(row.getString("sa_orderitemsid")).isEmpty()) {
+                    return getErrReturnObject().setErrMsg("行号为：【" + row.getString("rowno") + "】的发货单明细不存在对应得订单行，无法复核")
                             .toString();
                 }
-            } else {
-                if (!row.getString("status").equals("复核")) {
-                    return getErrReturnObject().setErrMsg("单号为：【" + row.getString("billno") + "】的发货单为非复核状态，无法反复核")
+                if (row.getBigDecimal("qty").compareTo(rowsMap.get(row.getString("sa_orderitemsid")).get(0).getBigDecimal("undeliqty")) == 1) {
+                    return getErrReturnObject().setErrMsg("行号为：【" + row.getString("rowno") + "】的发货单明细的数量大于对应订单行的未发货数量，无法复核")
                             .toString();
                 }
+                sqlList.add("update sa_orderitems set undeliqty=" + rowsMap.get(row.getLong("sa_orderitemsid")).get(0).getBigDecimal("undeliqty").subtract(row.getBigDecimal("qty")) + ",deliedqty=" + (row.getBigDecimal("qty").add(rowsMap.get(row.getLong("sa_orderitemsid")).get(0).getBigDecimal("deliedqty"))) + " where sa_orderitemsid=" + row.getLong("sa_orderitemsid"));
             }
+        }else {
+            return getErrReturnObject().setErrMsg("该发货单明细不存在，无法复核").toString();
+        }
 
+        Rows rows = dbConnect.runSqlQuery("select t1.*,t3.agentnum,t2.enterprisename,t4.sonum,t5.name,t5.phonenumber,t5.address from sa_dispatch t1 left join sys_enterprise t2  on t1.sys_enterpriseid=t2.sys_enterpriseid and t1.siteid=t2.siteid left join sa_agents t3 on t1.sys_enterpriseid=t3.sys_enterpriseid and t1.siteid=t3.siteid left join sa_order t4 on t1.sa_orderid=t4.sa_orderid and t1.siteid=t4.siteid left join sys_enterprise_contacts t5 on t1.rec_contactsid=t5.contactsid and t1.siteid=t5.siteid where t1.sa_dispatchid ='"
+                + sa_dispatchid + "' and  t1.siteid='" + siteid + "'");
+        Rows rowsdetail = dbConnect.runSqlQuery("select t3.sonum,t2.rowno sorowno,t4.itemno,t1.batchno,t1.rowno,t1.qty,t2.price,t1.remarks from sa_dispatch_items t1 left join sa_orderitems t2 on t1.sa_orderitemsid=t2.sa_orderitemsid and t1.siteid=t2.siteid left join sa_order t3 on t2.sa_orderid=t3.sa_orderid and t2.siteid=t3.siteid left join plm_item t4 on t1.itemid=t4.itemid and t1.siteid=t4.siteid  where t1.sa_dispatchid ='"
+                + sa_dispatchid + "' and  t1.siteid='" + siteid + "'");
+        SQLFactory sqlFactoryupdate = new SQLFactory(this, "发货单复核");
+        Rows orderRows =dbConnect.runSqlQuery("select distinct t1.sa_orderid from sa_orderitems t1 inner join sa_dispatch_items t2 on t1.siteid=t2.siteid and t1.sa_orderitemsid=t2.sa_orderitemsid where t1.siteid='" + siteid + "' and t2.sa_dispatchid=" + sa_dispatchid);
+        if(orderRows.size()==1){
+            sqlList.add("update sa_dispatch set sa_orderid="+orderRows.get(0).getLong("sa_orderid")+" where siteid='" + siteid + "' and sa_dispatchid=" + sa_dispatchid);
         }
-        ArrayList<String> sqlList = new ArrayList<>();
-        SQLFactory sqlFactoryupdate;
-        if (isrecheck) {
-            sqlFactoryupdate = new SQLFactory(this, "发货单复核");
-            Rows orderRows =dbConnect.runSqlQuery("select distinct t1.sa_orderid from sa_orderitems t1 inner join sa_dispatch_items t2 on t1.siteid=t2.siteid and t1.sa_orderitemsid=t2.sa_orderitemsid where t1.siteid='" + siteid + "' and t2.sa_dispatchid=" + sa_dispatchid);
-            if(orderRows.size()==1){
-                sqlList.add("update sa_dispatch set sa_orderid="+orderRows.get(0).getLong("sa_orderid")+" where siteid='" + siteid + "' and sa_dispatchid=" + sa_dispatchid);
-            }
-            //对接erp生成erp发货单
-            if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true")) {
-                ERPDocking erpDocking =new ERPDocking();
-                String result =erpDocking.createErpSainvoice(rows.get(0),rowsdetail,this,sa_dispatchid);
-                if(!result.equals("true")){
-                     System.out.println(result);
-                    return getErrReturnObject().setErrMsg(result).toString();
-                }
+        //对接erp生成erp发货单
+        if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true")) {
+            ERPDocking erpDocking =new ERPDocking();
+            String result =erpDocking.createErpSainvoice(rows.get(0),rowsdetail,this,sa_dispatchid);
+            if(!result.equals("true")){
+                System.out.println(result);
+                return getErrReturnObject().setErrMsg(result).toString();
             }
+        }
 //            //判断当前订单是否已发完货，如果发完，则生把订单变为关闭状态
 //            //总数量
 //            Rows totalRows = dbConnect.runSqlQuery("select count(1) count,sa_orderid from sa_orderitems where siteid='" + siteid + "' group by sa_orderid");
@@ -568,23 +582,19 @@ public class dispatch extends Controller {
 //                    }
 //                }
 //            }
-            Executor.sendEml(this, "dispatchreccheck", sa_dispatchid,new ArrayList<>());
-            sqlList.add(DataContrlLog.createLog(this, "sa_dispatch", sa_dispatchid, "复核", "发货单复核成功").getSQL());
+        Executor.sendEml(this, "dispatchreccheck", sa_dispatchid,new ArrayList<>());
+        sqlList.add(DataContrlLog.createLog(this, "sa_dispatch", sa_dispatchid, "复核", "发货单复核成功").getSQL());
 
-        } else {
-            sqlFactoryupdate = new SQLFactory(this, "发货单反复核");
-            sqlList.add(DataContrlLog.createLog(this, "sa_dispatch", sa_dispatchid, "反复核", "发货单反复核成功").getSQL());
-        }
         sqlFactoryupdate.addParameter("siteid", siteid);
         sqlFactoryupdate.addParameter("sa_dispatchid", sa_dispatchid);
         sqlFactoryupdate.addParameter("recheckby", username);
         sqlList.add(sqlFactoryupdate.getSQL());
         dbConnect.runSqlUpdate(sqlList);
-        if(isrecheck){
-            Long sys_enterpriseid = rows.get(0).getLong("sys_enterpriseid");
-            String message = "您的发货单"+rows.get(0).getString("billno")+"已复核，请及时查看！";
-            sendMsg(message, sa_dispatchid, sys_enterpriseid);
-        }
+
+        Long sys_enterpriseid = rows.get(0).getLong("sys_enterpriseid");
+        String message = "您的发货单"+rows.get(0).getString("billno")+"已复核，请及时查看！";
+        sendMsg(message, sa_dispatchid, sys_enterpriseid);
+
         return getSucReturnObject().toString();
     }