bug修复

src/custom/beans/stockbill/bills/XSCK.java

@@ -85,11 +85,11 @@ public class XSCK extends BasicBill {
                 BigDecimal qty =row.getBigDecimal("qty");
                 if(!isInStock(ischeck)){
                     if (!invbalsRowsMap.containsKey(String.valueOf(itemid)) || !invbalsRowsMap.get(String.valueOf(itemid)).toRowsMap("stockid").containsKey(String.valueOf(stockid))) {
-                        throw new YosException("行【"+row.getString("itemno")+"】不能负库存出库");
+                        throw new YosException("行【"+row.getString("rowno")+"】不能负库存出库");
                     } else {
                         BigDecimal invbalqty = invbalsRowsMap.get(String.valueOf(itemid)).toRowsMap("stockid").get(String.valueOf(stockid)).get(0).getBigDecimal("qty");
                         if(invbalqty.compareTo(qty)<0){
-                            throw new YosException("行【"+row.getString("itemno")+"】不能负库存出库");
+                            throw new YosException("行【"+row.getString("rowno")+"】不能负库存出库");
                         }
                     }
                 }

src/custom/restcontroller/R.java

@@ -6971,6 +6971,11 @@ public class R {
         public static class v1 {
         }
     }
+
+    public static class ID2025121717464803 {
+        public static class v1 {
+        }
+    }
 }
 
 

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

@@ -518,6 +518,11 @@ public class accessoryorder extends Controller {
                 where.append("t1.phonenumber ='").append(whereObject.getString("phonenumber")).append("' ");
                 where.append(")");
             }
+            if (whereObject.containsKey("address") && !"".equals(whereObject.getString("address"))) {
+                where.append(" and(");
+                where.append("t1.address like '%").append(whereObject.getString("address")).append("%' ");
+                where.append(")");
+            }
         }
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_warrantycard", "*");
         querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t2", "t1.sa_agentsid = t2.sa_agentsid AND t1.siteid = t2.siteid");

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

@@ -318,6 +318,35 @@ public class tpartreimbursement extends Controller {
         return getSucReturnObject().toString();
     }
 
+    @API(title = "反审核", apiversion = R.ID2025121717464803.v1.class)
+    @CACHEING_CLEAN(apiClass = {tpartreimbursement.class})
+    public String uncheck() throws YosException {
+        Long sa_tpartreimbursementid = content.getLong("sa_tpartreimbursementid");
+        Rows rows = dbConnect.runSqlQuery("select t1.billno,t1.status from sa_tpartreimbursement t1 where t1.sa_tpartreimbursementid ='"
+                + sa_tpartreimbursementid + "' and  t1.siteid='" + siteid + "'");
+
+        for (Row row : rows) {
+            if (!row.getString("status").equals("审核")) {
+                return getErrReturnObject().setErrMsg("单号为：【" + row.getString("billno") + "】的配件核销单为非审核状态，无法反审核")
+                        .toString();
+            }
+
+        }
+        ArrayList<String> sqlList = new ArrayList<>();
+        sqlList.add(
+                DataContrlLog.createLog(this, "sa_tpartreimbursement", sa_tpartreimbursementid, "反审核", "配件核销单反审核成功").getSQL());
+        UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, "sa_tpartreimbursement");
+        updateSQL.setUniqueid(sa_tpartreimbursementid);
+        updateSQL.setSiteid(siteid);
+        updateSQL.setValue("status", "反审核");
+        updateSQL.setValue("checkby", "");
+        updateSQL.setValue("checkdate","null");
+
+        sqlList.add(updateSQL.getSQL());
+        dbConnect.runSqlUpdate(sqlList);
+        return getSucReturnObject().toString();
+    }
+
     @API(title = "选择要核销的配件核销单明细", apiversion = R.ID2025081909593203.v1.class)
     @CACHEING
     public String quertpartreimbursementdetailList() throws YosException {