返退单明细增加spec

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

@@ -127,13 +127,14 @@ public class aftersalesmag extends Controller {
         insertSQLdetail.setValue("stockdate", StringUtils.isBlank(content.getStringValue("stockdate")) ? "null" : content.getStringValue("stockdate"));
         insertSQLdetail.setValue("enddate", StringUtils.isBlank(content.getStringValue("enddate")) ? "null" : content.getStringValue("enddate"));
         insertSQLdetail.setValue("model", content.getStringValue("model"));
+        insertSQLdetail.setValue("spec", content.getStringValue("spec"));
         insertSQLdetail.setValue("unitname", content.getStringValue("unitname"));
         insertSQLdetail.setValue("itemname", content.getStringValue("itemname"));
         insertSQLdetail.setValue("itemno", content.getStringValue("itemno"));
         insertSQLdetail.setValue("duty", content.getStringValue("duty"));
         insertSQLdetail.setValue("demand", content.getStringValue("demand"));
         insertSQLdetail.setValue("machinecode", content.getStringValue("machinecode"));
-        insertSQLdetail.setValue("qty", 1);
+        insertSQLdetail.setValue("qty", content.containsKey("qty")?content.getIntValue("qty"):1);
         insertSQLdetail.setValue("itemid", content.getLongValue("itemid"));
         sqlList.add(insertSQLdetail.getSQL());
 
@@ -205,7 +206,7 @@ public class aftersalesmag extends Controller {
 //        Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL(false));
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_itemsku ", "sku");
         querySQL.setTableAlias("t1");
-        querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t2", "t1.itemid=t2.itemid and t1.siteid=t2.siteid","itemno","itemname","model");
+        querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t2", "t1.itemid=t2.itemid and t1.siteid=t2.siteid","itemno","itemname","model","spec");
         querySQL.addJoinTable(JOINTYPE.left, "plm_unit", "t3", "t3.unitid=t2.unitid and t3.siteid=t2.siteid","unitname");
         querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t4", "t4.sa_agentsid=t1.sa_agentsid and t4.siteid=t1.siteid");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t5", "t5.sys_enterpriseid=t4.sys_enterpriseid and t5.siteid=t4.siteid","contact","phonenumber","address");
@@ -232,7 +233,7 @@ public class aftersalesmag extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t1.sys_enterpriseid = t2.sys_enterpriseid AND t1.siteid = t2.siteid","enterprisename");
         querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t3", "t1.sys_enterpriseid = t3.sys_enterpriseid AND t1.siteid = t3.siteid","agentnum");
         querySQL.addJoinTable(JOINTYPE.left, "sa_aftersalesmag_items", "t4", "t1.sa_aftersalesmagid = t4.sa_aftersalesmagid AND t1.siteid = t4.siteid","name","phonenumber","address",
-                "stockdate","enddate","model","unitname","itemname","itemno","duty","demand","machinecode","qty","itemid");
+                "stockdate","enddate","model","spec","unitname","itemname","itemno","duty","demand","machinecode","qty","itemid");
         querySQL.addJoinTable(JOINTYPE.left, "sa_warrantycard", "t5", "t5.sku = t4.machinecode AND t5.siteid = t4.siteid","cardno");
         querySQL.addQueryFields("remarksdetail","t4.remarks");
         querySQL.addQueryFields("reasondetail","t4.reason");