发货单行关闭bug修复

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

@@ -499,13 +499,12 @@ public class dispatch extends Controller {
         BatchDeleteErr batchDeleteErr = BatchDeleteErr.create(this, sa_dispatch_itemsids.size());
         String sql ="";
         if(sa_dispatch_itemsids.size()>0){
-            sql ="select t1.sa_dispatch_itemsid,t1.sa_orderitemsid,t1.qty,t1.outwarehouseqty,t1.sa_dispatchid,t1.rowno,t3.itemno,t2.billno,t2.status from sa_dispatch_items t1 left join sa_dispatch t2 on t1.sa_dispatchid=t2.sa_dispatchid and t1.siteid=t2.siteid left join plm_item t3 on t1.itemid=t3.itemid and t1.siteid=t3.siteid where t1.sa_dispatch_itemsid in" + sa_dispatch_itemsids.toJSONString() + " and  t1.siteid='" + siteid + "'";
+            sql ="select t1.sa_dispatch_itemsid,t1.sa_orderitemsid,t1.qty,t1.outwarehouseqty,t1.sa_dispatchid,t1.rowno,t3.itemno,t2.billno,t2.status,t1.isclose from sa_dispatch_items t1 left join sa_dispatch t2 on t1.sa_dispatchid=t2.sa_dispatchid and t1.siteid=t2.siteid left join plm_item t3 on t1.itemid=t3.itemid and t1.siteid=t3.siteid where t1.sa_dispatch_itemsid in" + sa_dispatch_itemsids.toJSONString() + " and  t1.siteid='" + siteid + "'";
             sql = sql.replace("[", "(").replace("]", ")");
         }else {
             return getErrReturnObject().setErrMsg("请选择发货单行后，进行行关闭").toString();
         }
 
-
         Rows rows = dbConnect.runSqlQuery(sql);
         if (rows.isEmpty()) {
             return getErrReturnObject().setErrMsg("该发货单所选行不存在")
@@ -523,6 +522,10 @@ public class dispatch extends Controller {
         RowsMap rowsMap = rowsOrderDetail.toRowsMap("sa_orderitemsid");
         for (Row row :rows) {
             //对接erp生成erp发货单
+            if(row.getBoolean("isclose")){
+                batchDeleteErr.addErr(row.getLong("sa_dispatch_itemsid"), "第"+row.getString("rowno")+"行的发货单明细已关闭，请勿重复关闭");
+                continue;
+            }
             if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") && siteid.equalsIgnoreCase("ccyosg")) {
                 ERPDocking erpDocking =new ERPDocking();
                 String result =erpDocking.closeErpSainvoiceRow(row.getString("billno"),this,row.getLong("rowno"),row.getString("itemno"),row.getLong("sa_dispatchid"));