保修卡生成bug修复

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

@@ -208,7 +208,7 @@ public class aftersalesmag extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "sa_warrantycard", "t6", "t6.sku=t1.sku and t6.siteid=t1.siteid", "cardno", "begdate", "enddate");
 
         querySQL.setSiteid(siteid);
-        querySQL.setWhere("t1.sa_agentsid in (select sa_agentsid from sa_agents where  sys_enterpriseid=" + sys_enterpriseid + ")");
+        querySQL.setWhere("(t1.sa_agentsid in (select sa_agentsid from sa_agents where  sys_enterpriseid=" + sys_enterpriseid + ") or t1.sys_enterpriseid="+sys_enterpriseid+")");
         querySQL.setWhere("t1.sku not in (select distinct machinecode from sa_aftersalesmag_items where siteid='" + siteid + "' and ifnull(machinecode,'')!='')");
         querySQL.setWhere(where.toString());
         querySQL.addQueryFields("cardname","t6.name");

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

@@ -1244,6 +1244,7 @@ public class workorder extends Controller {
                 insertSQL.setValue("county", itemrows.get(0).getString("county"));
                 insertSQL.setValue("enddate", formattedDate);
                 insertSQL.setValue("begdate", getDateTime_Str());
+                insertSQL.setValue("itemid",  itemrows.get(0).getLong("itemid"));
                 insertSQL.setValue("sa_workorderid",sa_workorderid);
                 if (dbConnect.runSqlQuery("select * from sa_warrantycard where sku='" + itemrows.get(0).getString("sku") + "' and siteid='" + siteid + "' and isvoid=0").isNotEmpty()) {
                     return getErrReturnObject().setErrMsg("该序列号已安装,无法再次安装").toString();