优化

src/custom/restcontroller/crm/agent/customer/Customer.java

@@ -109,6 +109,13 @@ public class Customer extends Controller {
             insertSQL.setValue("source", source);// 客户来源
             insertSQL.setValue("sa_storeid", userInfo.getStoreID());// 门店ID
             if (sat_orderclueid > 0) {
+                Rows rows = dbConnect.runSqlQuery("select * from sat_orderclue where sat_orderclueid=" + sat_orderclueid);
+                if (rows.isEmpty()) {
+                    return getErrReturnObject().setErrMsg("线索" + sat_orderclueid + "不存在").toString();
+                }
+                if (rows.get(0).getString("status").equals("已转化")) {
+                    return getErrReturnObject().setErrMsg("线索已转化，不可重复转化").toString();
+                }
                 insertSQL.setValue("sourcetable", "sat_orderclue");// 关联数据表
                 insertSQL.setValue("sourceid", sat_orderclueid);// 关联数据id
                 insertSQL.setValue("source", "线索转化");// 客户来源

src/custom/restcontroller/crm/agent/custorder/Custorder.java

@@ -94,6 +94,7 @@ public class Custorder extends Controller {
             insertSQL.setValue("sa_customersid", sa_customersid);// 合作企业档案ID
             insertSQL.setUniqueid(sa_custorderid);
             sqldump.add(insertSQL);
+            sqldump.add(SQLFactory.createUpdateSQL(this, "sa_customers").setValue("status", "正式").setWhere("sys_enterpriseid", sys_enterpriseid).setUniqueid(sa_customersid));
         } else {
             UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, "sa_custorder");
             updateSQL.setValue("remarks", remarks);// 备注说明

src/custom/restcontroller/crm/agent/item/item.java

@@ -63,7 +63,7 @@ public class item extends Controller {
             long itemid = itemids.getLongValue(i);
             if (!sys_enterprise_itemids.contains(itemid) && plm_itemrowsMap.containsKey(String.valueOf(itemid))) {
                 Row itemrow = plm_itemrowsMap.get(String.valueOf(itemid)).getRow(0);
-                double packageqty = itemrow.getDouble("packageqty");
+                double packageqty = itemrow.getDouble("packageqty", 1);
                 double safeqty = itemrow.getDouble("safeqty");
                 String remarks = itemrow.getString("remarks");
                 boolean ismodule = itemrow.getBoolean("ismodule");
@@ -230,13 +230,18 @@ public class item extends Controller {
             if (custorderitemsRows.isNotEmpty()) {
                 return getErrReturnObject().setErrMsg("商品" + enterprise_itemRows.getRow(0).getString("itemname") + "已存在订单，无法删除").toString();
             }
-            QuerySQL invbalQuery = SQLFactory.createQuerySQL(this, "sys_enterprise_invbal");
-            invbalQuery.setSiteid(siteid);
-            invbalQuery.setWhere("sys_enterprise_itemid", sys_enterprise_itemid);
-            if (!invbalQuery.query().isEmpty()) {
-                return getErrReturnObject().setErrMsg("该商品存在库存，不可删除！").toString();
+
+            QuerySQL usecheck = SQLFactory.createQuerySQL(this, "sys_enterprise_item").setTableAlias("t1");
+            usecheck.setSiteid(siteid);
+            usecheck.setWhere("sys_enterprise_itemid", sys_enterprise_itemid);
+            usecheck.setWhere("exists(select distinct sys_enterprise_itemid from sys_enterprise_invbal t2 where t1.sys_enterprise_itemid=t2.sys_enterprise_itemid)" +
+                    "or exists(select distinct sys_enterprise_itemid from sa_custorderitems t3 where t1.sys_enterprise_itemid=t3.sys_enterprise_itemid)" +
+                    "or exists(select distinct sys_enterprise_itemid from sys_enterprise_stockbill_items t4 where t1.sys_enterprise_itemid=t4.sys_enterprise_itemid)");
+            if (!usecheck.query().isEmpty()) {
+                return getErrReturnObject().setErrMsg("该商品已被使用，不可删除！").toString();
             }
 
+
             SQLFactory.createDeleteSQL(this, "sys_enterprise_item").setSiteid(siteid).setWhere("sys_enterprise_itemid", sys_enterprise_itemid).delete();
         }
         return getSucReturnObject().toString();