Browse Source

数据库管理新增空闲空间释放功能

shenjingwei 2 months ago
parent
commit
8040914095
2 changed files with 5 additions and 2 deletions
  1. 1 1
      pom.xml
  2. 4 1
      src/custom/common/crm/bean/sku_crm.java

+ 1 - 1
pom.xml

@@ -92,7 +92,7 @@
         <dependency>
             <groupId>com.yunlian.yos</groupId>
             <artifactId>yos-core</artifactId>
-            <version>3.2.24</version>
+            <version>3.2.25</version>
         </dependency>
         <dependency>
             <groupId>com.microsoft.sqlserver</groupId>

+ 4 - 1
src/custom/common/crm/bean/sku_crm.java

@@ -35,6 +35,8 @@ public class sku_crm extends CrmBase {
             String fstockno = fagentnum != null && !fagentnum.isEmpty() ? "00" : "";
             String changeby = skuObject.getString("changeby");
             String changedate = skuObject.getString("changetime");
+            String fisyj = skuObject.getString("fisyj");
+
             String fnotes = "CRM更新[fstocknoOfCrm: " + fstockno + "]";
 
             Rows codeRows = dbConnect.runSqlQuery("select * from sa_itemsku where siteid='MD' and sku='" + fmechineCode + "'");
@@ -54,6 +56,7 @@ public class sku_crm extends CrmBase {
                 return false;
             }
 
+            // Rows rows = crmDBConnect.runSqlQuery("select * from br_machinecode where fbrand_id=1 and fmechine_code='" + fmechineCode + "'");//临时从crm获取是否样机
             SQLDump sqlDump = new SQLDump();
 
             UpdateSQL saItemsku = SQLFactory.createUpdateSQL(dbConnect, "sa_itemsku");
@@ -62,6 +65,7 @@ public class sku_crm extends CrmBase {
             saItemsku.setValue("stockid", fstockno.isEmpty() ? "null" : stockRows.get(0).getLong("stockid"));
             saItemsku.setValue("changeby", changeby);
             saItemsku.setValue("changedate", changedate);
+            saItemsku.setValue("isyj", fisyj);
             saItemsku.setWhere("sa_itemskuid", codeRows.get(0).getLong("sa_itemskuid"));
             saItemsku.setSiteid("MD");
             sqlDump.add(saItemsku);
@@ -80,7 +84,6 @@ public class sku_crm extends CrmBase {
             saItemskuChange.setValue("changedate", changedate);
 
             sqlDump.add(saItemskuChange);
-
             sqlDump.commit();
             return true;
         } catch (Exception e) {