发货单反审核暂时放出

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

@@ -365,51 +365,51 @@ public class dispatch extends Controller {
 //    }
 //
 //
-//    @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.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)