bug修复

src/custom/restcontroller/webmanage/sale/sendplan/sendplandetail.java

@@ -8,6 +8,7 @@ import common.annotation.API;
 import common.annotation.CACHEING;
 import common.annotation.CACHEING_CLEAN;
 import common.data.*;
+import org.apache.commons.lang.StringUtils;
 import restcontroller.R;
 
 import java.math.BigDecimal;
@@ -293,9 +294,10 @@ public class sendplandetail extends Controller {
         long sa_sendplanid = content.getLong("sa_sendplanid");
         Rows rows = dbConnect.runSqlQuery("select * from sa_sendplan where sa_sendplanid=" + sa_sendplanid);
         ArrayList<Long> sa_orderitemsids = new ArrayList<>();
-
+        String billdate = "";
         if (rows.isNotEmpty()) {
             departmentid = rows.get(0).getLong("departmentid");
+            billdate=rows.get(0).getString("senddate");
         }
         JSONArray detailarray = content.getJSONArray("details");
         ArrayList<String> sqlList = new ArrayList<>();
@@ -389,7 +391,7 @@ public class sendplandetail extends Controller {
                 }
 
 
-                sqlFactory.addParameter("billdate", getDateTime_Str());
+                sqlFactory.addParameter("billdate", StringUtils.isBlank(billdate)?getDateTime_Str():billdate);
                 sqlFactory.addParameter("createby", username);
                 sqlFactory.addParameter("createdate", getDateTime_Str());
                 sqlFactory.addParameter("changeby", username);

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

@@ -174,7 +174,7 @@ public class sendrepair extends Controller {
 
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_sendrepair", "*");
         querySQL.setTableAlias("t1");
-        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t1.sys_enterpriseid = t2.sys_enterpriseid AND t1.siteid = t2.siteid","enterprisename");
+        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t1.sys_enterpriseid = t2.sys_enterpriseid AND t1.siteid = t2.siteid","enterprisename","abbreviation");
         querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t3", "t1.sys_enterpriseid = t3.sys_enterpriseid AND t1.siteid = t3.siteid","agentnum");
         querySQL.addJoinTable(JOINTYPE.left, "sa_sendrepair_detail", "t4", "t1.sa_sendrepairid = t4.sa_sendrepairid AND t1.siteid = t4.siteid","newspec","newitemno","newitemname",
                 "newitemid","newsku","agentcost","practicalamount","instockdate","amount","logisticscost","logistics","idearemarks","disposition","demand","reason","duty",