bug优化

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

@@ -549,6 +549,7 @@ public class aftersalesmag extends Controller {
         }
         ArrayList<String> sqlList = new ArrayList<>();
         SQLFactory sqlFactoryupdate;
+        Rows departmenthrrows =dbConnect.runSqlQuery("select *from sys_departmenthrid where hrid="+hrid);
         if (ischeck) {
             InsertSQL insertSQL = SQLFactory.createInsertSQL(this, "st_stockbill");
             long st_stockbillid = createTableID("st_stockbill");
@@ -560,6 +561,7 @@ public class aftersalesmag extends Controller {
             insertSQL.setValue("sys_enterpriseid", rows.get(0).getLong("sys_enterpriseid"));
             insertSQL.setValue("rb", 1);
             insertSQL.setValue("sourceobject", "sa_aftersalesmag");
+            insertSQL.setValue("departmentid", departmenthrrows.isNotEmpty()?departmenthrrows.get(0).getLong("departmentid"):0);
             insertSQL.setValue("sourceid", sa_aftersalesmagid);
             insertSQL.setValue("stockid", stockid);
             insertSQL.setValue("remarks", rows.get(0).getString("remarks"));
@@ -568,7 +570,8 @@ public class aftersalesmag extends Controller {
             insertSQL.setDateValue("createdate");
             insertSQL.setDateValue("billdate");
             sqlList.add(insertSQL.getSQL());
-
+            sqlList.add(
+                    DataContrlLog.createLog(this, "st_stockbill", st_stockbillid, "新增", "返修入库新增成功").getSQL());
             int i = 1;
             for (Row row : rowsdetail) {
                 insertSQL = SQLFactory.createInsertSQL(this, "st_stockbill_items");

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

@@ -712,8 +712,14 @@ public class serviceorder extends Controller {
             }
         }
 
-        sqlList.add("update sa_workorder set status='待接单' where sa_workorderid ='"
-                + sa_workorderid + "' and  siteid='" + siteid + "'");
+        if(rows.get(0).getString("status").equals("提交")){
+            sqlList.add("update sa_workorder set status='进行中' where sa_workorderid ='"
+                    + sa_workorderid + "' and  siteid='" + siteid + "'");
+        }else{
+            sqlList.add("update sa_workorder set status='待接单' where sa_workorderid ='"
+                    + sa_workorderid + "' and  siteid='" + siteid + "'");
+        }
+
         sqlList.add("delete from sys_datateam where ownertable='sa_workorder' and ownerid="
                 + sa_workorderid + " and siteid='" + siteid + "'");
         if (projectlearders != null && !projectlearders.isEmpty()) {

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

@@ -383,7 +383,7 @@ public class toolscode extends Controller {
     @API(title = "查询序列号使用记录", apiversion = R.ID2025101809551503.v1.class)
     public String querySkuUsedList() throws YosException {
         String sku = content.getString("sku");
-        Rows rows = dbConnect.runSqlQuery("select * from sku_use_view where sku='" + sku + "' order by checkdate asc");
+        Rows rows = dbConnect.runSqlQuery("select * from sku_use_view where sku='" + sku + "' order by checkdate desc");
         return getSucReturnObject().setData(rows).toString();
     }
 

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

@@ -645,7 +645,7 @@ public class workorder extends Controller {
             if (ordernode.getLong("parentid") == 0) {
 //                return getErrReturnObject().setErrMsg("该工序不是末级节点").toString();
             } else if (ordernode.getLong("status") == 1) {
-                return getErrReturnObject().setErrMsg("该工序已完成，无法修改").toString();
+                //return getErrReturnObject().setErrMsg("该工序已完成，无法修改").toString();
             }
             ordernode.put("workpresetjson", JSONObject.parseObject(ordernode.getString("workpresetjson"))); // 转化成json
             SQLFactory updateNodesqlFactory = new SQLFactory(this, "服务工单节点更新");