|
|
@@ -50,7 +50,7 @@ public class OrderItems extends Controller {
|
|
|
super(content);
|
|
|
}
|
|
|
|
|
|
- @API(title = "新增或更新", apiversion = R.ID20221109093602.v1.class,intervaltime = 200)
|
|
|
+ @API(title = "新增或更新", apiversion = R.ID20221109093602.v1.class, intervaltime = 200)
|
|
|
@CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, ToolBill.class})
|
|
|
public String insertOrUpdate() throws YosException {
|
|
|
Long sa_orderid = content.getLong("sa_orderid");
|
|
|
@@ -72,7 +72,16 @@ public class OrderItems extends Controller {
|
|
|
//查询erp库存
|
|
|
// Invbal.selectErpInvbal(this, items);
|
|
|
|
|
|
- Rows itemRows = dbConnect.runSqlQuery("select t1.*,t2.material from plm_item t1 left join plm_itemextend t2 ON t2.itemid = t1.itemid AND t2.siteid = t1.siteid where t1.siteid='" + siteid + "' ");
|
|
|
+ ArrayList<Long> itemids = new ArrayList<>();
|
|
|
+ for (Object obj : items) {
|
|
|
+ JSONObject item = (JSONObject) obj;
|
|
|
+ itemids.add(item.getLong("itemid"));
|
|
|
+ }
|
|
|
+
|
|
|
+ String sql = "select t1.*,t2.material from plm_item t1 left join plm_itemextend t2 ON t2.itemid = t1.itemid AND t2.siteid = t1.siteid where t1.siteid='" + siteid + "' and t1.itemid in " + itemids;
|
|
|
+ sql = sql.replace("[", "(").replace("]", ")");
|
|
|
+ Rows itemRows = dbConnect.runSqlQuery(sql);
|
|
|
+
|
|
|
RowsMap itemRowsMap = itemRows.toRowsMap("itemid");
|
|
|
BigDecimal sumqty = BigDecimal.ZERO;
|
|
|
for (Object obj : items) {
|
|
|
@@ -118,41 +127,41 @@ public class OrderItems extends Controller {
|
|
|
|
|
|
BigDecimal price1 = new BigDecimal(0);
|
|
|
SQLFactory sqlFactory = new SQLFactory(this, "订单商品明细_新增");
|
|
|
- JSONArray customproperties=new JSONArray();
|
|
|
+ JSONArray customproperties = new JSONArray();
|
|
|
if (sa_orderitemsid <= 0) {
|
|
|
Rows rows = dbConnect.runSqlQuery("SELECT sa_orderitemsid,price from sa_orderitems WHERE siteid='" + siteid + "' and itemid=" + itemid + " and sa_orderid=" + sa_orderid);
|
|
|
|
|
|
- Rows customschemeRows= dbConnect.runSqlQuery("select * from sa_customscheme_items where siteid='"+siteid+"'");
|
|
|
- RowsMap customschemeRowsMap= customschemeRows.toRowsMap("sa_customschemeid");
|
|
|
+ Rows customschemeRows = dbConnect.runSqlQuery("select * from sa_customscheme_items where siteid='" + siteid + "'");
|
|
|
+ RowsMap customschemeRowsMap = customschemeRows.toRowsMap("sa_customschemeid");
|
|
|
|
|
|
if (itemRowsMap.containsKey(item.getString("itemid"))) {
|
|
|
if (itemRowsMap.get(item.getString("itemid")).isNotEmpty()) {
|
|
|
- if(itemRowsMap.get(item.getString("itemid")).get(0).getLong("sa_customschemeid")>0 && !itemRowsMap.get(item.getString("itemid")).get(0).getBoolean("iscustomsize")){
|
|
|
+ if (itemRowsMap.get(item.getString("itemid")).get(0).getLong("sa_customschemeid") > 0 && !itemRowsMap.get(item.getString("itemid")).get(0).getBoolean("iscustomsize")) {
|
|
|
System.out.println(0000);
|
|
|
- if(customschemeRowsMap.containsKey(itemRowsMap.get(item.getString("itemid")).get(0).getString("sa_customschemeid"))){
|
|
|
+ if (customschemeRowsMap.containsKey(itemRowsMap.get(item.getString("itemid")).get(0).getString("sa_customschemeid"))) {
|
|
|
System.out.println(111111);
|
|
|
- for (Row customschemeItem:(customschemeRowsMap.get(itemRowsMap.get(item.getString("itemid")).get(0).getString("sa_customschemeid")))) {
|
|
|
+ for (Row customschemeItem : (customschemeRowsMap.get(itemRowsMap.get(item.getString("itemid")).get(0).getString("sa_customschemeid")))) {
|
|
|
System.out.println(customschemeItem.getString("description"));
|
|
|
System.out.println(2222);
|
|
|
- customproperties.add(customschemeItem.getString("description")+":"+itemRowsMap.get(item.getString("itemid")).get(0).getString(customschemeItem.getString("value")));
|
|
|
+ customproperties.add(customschemeItem.getString("description") + ":" + itemRowsMap.get(item.getString("itemid")).get(0).getString(customschemeItem.getString("value")));
|
|
|
}
|
|
|
}
|
|
|
- } else if(itemRowsMap.get(item.getString("itemid")).get(0).getBoolean("iscustomsize")){
|
|
|
+ } else if (itemRowsMap.get(item.getString("itemid")).get(0).getBoolean("iscustomsize")) {
|
|
|
System.out.println(3333);
|
|
|
- if(customschemeRowsMap.containsKey(itemRowsMap.get(item.getString("itemid")).get(0).getString("sa_customschemeid"))){
|
|
|
+ if (customschemeRowsMap.containsKey(itemRowsMap.get(item.getString("itemid")).get(0).getString("sa_customschemeid"))) {
|
|
|
System.out.println(4444);
|
|
|
- for (Row customschemeItem:(customschemeRowsMap.get(itemRowsMap.get(item.getString("itemid")).get(0).getString("sa_customschemeid")))) {
|
|
|
+ for (Row customschemeItem : (customschemeRowsMap.get(itemRowsMap.get(item.getString("itemid")).get(0).getString("sa_customschemeid")))) {
|
|
|
System.out.println(5555);
|
|
|
System.out.println((customschemeRowsMap.get(itemRowsMap.get(item.getString("itemid")).get(0).getString("sa_customschemeid"))).size());
|
|
|
- if(!customschemeItem.getString("value").equals("spec")){
|
|
|
- customproperties.add(customschemeItem.getString("description")+":"+itemRowsMap.get(item.getString("itemid")).get(0).getString(customschemeItem.getString("value")));
|
|
|
- }else{
|
|
|
- customproperties.add("尺寸:"+item.getString("length")+"*"+item.getString("width"));
|
|
|
+ if (!customschemeItem.getString("value").equals("spec")) {
|
|
|
+ customproperties.add(customschemeItem.getString("description") + ":" + itemRowsMap.get(item.getString("itemid")).get(0).getString(customschemeItem.getString("value")));
|
|
|
+ } else {
|
|
|
+ customproperties.add("尺寸:" + item.getString("length") + "*" + item.getString("width"));
|
|
|
}
|
|
|
|
|
|
}
|
|
|
- }else{
|
|
|
- customproperties.add("尺寸:"+item.getString("length")+"*"+item.getString("width"));
|
|
|
+ } else {
|
|
|
+ customproperties.add("尺寸:" + item.getString("length") + "*" + item.getString("width"));
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -241,10 +250,10 @@ public class OrderItems extends Controller {
|
|
|
price = itemPrice.getGraderateprice();
|
|
|
if (itemRowsMap.containsKey(item.getString("itemid"))) {
|
|
|
if (itemRowsMap.get(item.getString("itemid")).isNotEmpty()) {
|
|
|
- if(itemRowsMap.get(item.getString("itemid")).get(0).getBoolean("iscustomsize")){
|
|
|
- System.out.println(price);
|
|
|
- price=price.multiply(item.getBigDecimal("length").multiply(item.getBigDecimal("width")).divide(new BigDecimal("1000000"),4,BigDecimal.ROUND_HALF_UP));
|
|
|
- System.out.println(price);
|
|
|
+ if (itemRowsMap.get(item.getString("itemid")).get(0).getBoolean("iscustomsize")) {
|
|
|
+ System.out.println(price);
|
|
|
+ price = price.multiply(item.getBigDecimal("length").multiply(item.getBigDecimal("width")).divide(new BigDecimal("1000000"), 4, BigDecimal.ROUND_HALF_UP));
|
|
|
+ System.out.println(price);
|
|
|
}
|
|
|
|
|
|
}
|
|
|
@@ -340,90 +349,90 @@ public class OrderItems extends Controller {
|
|
|
if (orderRows.isEmpty()) {
|
|
|
return;
|
|
|
}
|
|
|
- JSONArray jsonArray =new JSONArray();
|
|
|
+ JSONArray jsonArray = new JSONArray();
|
|
|
BigDecimal orderSumamount = BigDecimal.ZERO;
|
|
|
- Rows classamountrows =dbConnect.runSqlQuery("select t3.topitemclassid,t1.siteid,sum(ifnull(t1.amount,0)) sumamount from sa_orderitems t1 inner join sa_itemsaleclass t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid inner join (select itemclassid,find_top(itemclassid) topitemclassid,siteid from plm_itemclass where siteid!='ZZYOS') t3 on t2.itemclassid=t3.itemclassid and t2.siteid=t3.siteid where t1.sa_orderid="+sa_orderid+" group by t3.topitemclassid,t1.siteid");
|
|
|
- for (Row classamountrow:classamountrows) {
|
|
|
- orderSumamount=orderSumamount.add(classamountrow.getBigDecimal("sumamount"));
|
|
|
+ Rows classamountrows = dbConnect.runSqlQuery("select t3.topitemclassid,t1.siteid,sum(ifnull(t1.amount,0)) sumamount from sa_orderitems t1 inner join sa_itemsaleclass t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid inner join (select itemclassid,find_top(itemclassid) topitemclassid,siteid from plm_itemclass where siteid!='ZZYOS') t3 on t2.itemclassid=t3.itemclassid and t2.siteid=t3.siteid where t1.sa_orderid=" + sa_orderid + " group by t3.topitemclassid,t1.siteid");
|
|
|
+ for (Row classamountrow : classamountrows) {
|
|
|
+ orderSumamount = orderSumamount.add(classamountrow.getBigDecimal("sumamount"));
|
|
|
}
|
|
|
- if(orderSumamount.compareTo(getAmount(this,sa_orderid))!=0){
|
|
|
+ if (orderSumamount.compareTo(getAmount(this, sa_orderid)) != 0) {
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- RowsMap classamountrowsMap =classamountrows.toRowsMap("topitemclassid");
|
|
|
- Rows accountclassrows =dbConnect.runSqlQuery("select t1.*,ifnull(t2.balance,0) balance,ifnull(t2.creditquota,0) creditquota from sa_accountclass t1 left join sa_accountbalance t2 on t1.sa_accountclassid=t2.sa_accountclassid and t1.siteid=t2.siteid and t2.sys_enterpriseid="+orderRows.get(0).getLong("pay_enterpriseid")+" where isused=1 and t1.siteid='"+siteid+"'");
|
|
|
+ RowsMap classamountrowsMap = classamountrows.toRowsMap("topitemclassid");
|
|
|
+ Rows accountclassrows = dbConnect.runSqlQuery("select t1.*,ifnull(t2.balance,0) balance,ifnull(t2.creditquota,0) creditquota from sa_accountclass t1 left join sa_accountbalance t2 on t1.sa_accountclassid=t2.sa_accountclassid and t1.siteid=t2.siteid and t2.sys_enterpriseid=" + orderRows.get(0).getLong("pay_enterpriseid") + " where isused=1 and t1.siteid='" + siteid + "'");
|
|
|
BigDecimal firstpayamount = BigDecimal.ZERO;
|
|
|
|
|
|
|
|
|
- if(!accountclassrows.isEmpty()){
|
|
|
- for (Row row:accountclassrows) {
|
|
|
- BigDecimal sumamount =BigDecimal.ZERO;
|
|
|
- JSONObject jsonObject =new JSONObject();
|
|
|
- if(row.getJSONArray("bindingcategories")!=null && !row.getJSONArray("bindingcategories").isEmpty()){
|
|
|
- for (Object object:row.getJSONArray("bindingcategories")) {
|
|
|
+ if (!accountclassrows.isEmpty()) {
|
|
|
+ for (Row row : accountclassrows) {
|
|
|
+ BigDecimal sumamount = BigDecimal.ZERO;
|
|
|
+ JSONObject jsonObject = new JSONObject();
|
|
|
+ if (row.getJSONArray("bindingcategories") != null && !row.getJSONArray("bindingcategories").isEmpty()) {
|
|
|
+ for (Object object : row.getJSONArray("bindingcategories")) {
|
|
|
Long topitemclassid = Long.valueOf(object.toString());
|
|
|
- if(classamountrowsMap.containsKey(object.toString())){
|
|
|
- if(classamountrowsMap.get(object.toString()).isNotEmpty()){
|
|
|
- sumamount=sumamount.add(classamountrowsMap.get(object.toString()).get(0).getBigDecimal("sumamount").multiply(row.getBigDecimal("maximumdiscount")).setScale(2, BigDecimal.ROUND_HALF_UP));
|
|
|
+ if (classamountrowsMap.containsKey(object.toString())) {
|
|
|
+ if (classamountrowsMap.get(object.toString()).isNotEmpty()) {
|
|
|
+ sumamount = sumamount.add(classamountrowsMap.get(object.toString()).get(0).getBigDecimal("sumamount").multiply(row.getBigDecimal("maximumdiscount")).setScale(2, BigDecimal.ROUND_HALF_UP));
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if(sumamount.compareTo(BigDecimal.ZERO)>0){
|
|
|
- if((row.getBigDecimal("balance").add(row.getBigDecimal("creditquota"))).compareTo(BigDecimal.ZERO)<=0){
|
|
|
+ if (sumamount.compareTo(BigDecimal.ZERO) > 0) {
|
|
|
+ if ((row.getBigDecimal("balance").add(row.getBigDecimal("creditquota"))).compareTo(BigDecimal.ZERO) <= 0) {
|
|
|
continue;
|
|
|
- }else if((row.getBigDecimal("balance").add(row.getBigDecimal("creditquota"))).compareTo(sumamount)<0){
|
|
|
+ } else if ((row.getBigDecimal("balance").add(row.getBigDecimal("creditquota"))).compareTo(sumamount) < 0) {
|
|
|
//部分优先账户扣款,部分现金扣款
|
|
|
- jsonObject.put("amount",row.getBigDecimal("balance").add(row.getBigDecimal("creditquota")));
|
|
|
- jsonObject.put("sa_accountclassid",row.getLong("sa_accountclassid"));
|
|
|
- jsonObject.put("accountname",row.getString("accountname"));
|
|
|
- jsonObject.put("balance",row.getBigDecimal("balance"));
|
|
|
- jsonObject.put("creditquota",row.getBigDecimal("creditquota"));
|
|
|
+ jsonObject.put("amount", row.getBigDecimal("balance").add(row.getBigDecimal("creditquota")));
|
|
|
+ jsonObject.put("sa_accountclassid", row.getLong("sa_accountclassid"));
|
|
|
+ jsonObject.put("accountname", row.getString("accountname"));
|
|
|
+ jsonObject.put("balance", row.getBigDecimal("balance"));
|
|
|
+ jsonObject.put("creditquota", row.getBigDecimal("creditquota"));
|
|
|
jsonArray.add(jsonObject);
|
|
|
- firstpayamount=firstpayamount.add(row.getBigDecimal("balance").add(row.getBigDecimal("creditquota")));
|
|
|
+ firstpayamount = firstpayamount.add(row.getBigDecimal("balance").add(row.getBigDecimal("creditquota")));
|
|
|
|
|
|
- }else if((row.getBigDecimal("balance").add(row.getBigDecimal("creditquota"))).compareTo(sumamount)>=0){
|
|
|
+ } else if ((row.getBigDecimal("balance").add(row.getBigDecimal("creditquota"))).compareTo(sumamount) >= 0) {
|
|
|
//全部优先账户扣款
|
|
|
- jsonObject.put("amount",sumamount);
|
|
|
- jsonObject.put("sa_accountclassid",row.getLong("sa_accountclassid"));
|
|
|
- jsonObject.put("accountname",row.getString("accountname"));
|
|
|
- jsonObject.put("balance",row.getBigDecimal("balance"));
|
|
|
- jsonObject.put("creditquota",row.getBigDecimal("creditquota"));
|
|
|
+ jsonObject.put("amount", sumamount);
|
|
|
+ jsonObject.put("sa_accountclassid", row.getLong("sa_accountclassid"));
|
|
|
+ jsonObject.put("accountname", row.getString("accountname"));
|
|
|
+ jsonObject.put("balance", row.getBigDecimal("balance"));
|
|
|
+ jsonObject.put("creditquota", row.getBigDecimal("creditquota"));
|
|
|
jsonArray.add(jsonObject);
|
|
|
- firstpayamount=firstpayamount.add(sumamount);
|
|
|
+ firstpayamount = firstpayamount.add(sumamount);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if(getAmount(this,sa_orderid).compareTo(BigDecimal.ZERO)==0){
|
|
|
- Rows xianjinaccountclassrows =dbConnect.runSqlQuery("select t1.*,ifnull(t2.balance,0) balance,ifnull(t2.creditquota,0) creditquota from sa_accountclass t1 left join sa_accountbalance t2 on t1.sa_accountclassid=t2.sa_accountclassid and t1.siteid=t2.siteid and t2.sys_enterpriseid="+orderRows.get(0).getLong("pay_enterpriseid")+" where isorder=1 and isused=1 and t1.sa_accountclassid="+orderRows.get(0).getLong("sa_accountclassid")+" and t1.siteid='"+siteid+"'");
|
|
|
- if(xianjinaccountclassrows.isNotEmpty()){
|
|
|
- JSONObject jsonObject =new JSONObject();
|
|
|
+ if (getAmount(this, sa_orderid).compareTo(BigDecimal.ZERO) == 0) {
|
|
|
+ Rows xianjinaccountclassrows = dbConnect.runSqlQuery("select t1.*,ifnull(t2.balance,0) balance,ifnull(t2.creditquota,0) creditquota from sa_accountclass t1 left join sa_accountbalance t2 on t1.sa_accountclassid=t2.sa_accountclassid and t1.siteid=t2.siteid and t2.sys_enterpriseid=" + orderRows.get(0).getLong("pay_enterpriseid") + " where isorder=1 and isused=1 and t1.sa_accountclassid=" + orderRows.get(0).getLong("sa_accountclassid") + " and t1.siteid='" + siteid + "'");
|
|
|
+ if (xianjinaccountclassrows.isNotEmpty()) {
|
|
|
+ JSONObject jsonObject = new JSONObject();
|
|
|
jsonObject.put("amount", BigDecimal.ZERO);
|
|
|
- jsonObject.put("sa_accountclassid",xianjinaccountclassrows.get(0).getLong("sa_accountclassid"));
|
|
|
- jsonObject.put("accountname",xianjinaccountclassrows.get(0).getString("accountname"));
|
|
|
- jsonObject.put("balance",xianjinaccountclassrows.get(0).getBigDecimal("balance"));
|
|
|
- jsonObject.put("creditquota",xianjinaccountclassrows.get(0).getBigDecimal("creditquota"));
|
|
|
+ jsonObject.put("sa_accountclassid", xianjinaccountclassrows.get(0).getLong("sa_accountclassid"));
|
|
|
+ jsonObject.put("accountname", xianjinaccountclassrows.get(0).getString("accountname"));
|
|
|
+ jsonObject.put("balance", xianjinaccountclassrows.get(0).getBigDecimal("balance"));
|
|
|
+ jsonObject.put("creditquota", xianjinaccountclassrows.get(0).getBigDecimal("creditquota"));
|
|
|
jsonArray.add(jsonObject);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if(orderSumamount.compareTo(firstpayamount)>0){
|
|
|
+ if (orderSumamount.compareTo(firstpayamount) > 0) {
|
|
|
|
|
|
- Rows xianjinaccountclassrows =dbConnect.runSqlQuery("select t1.*,ifnull(t2.balance,0) balance,ifnull(t2.creditquota,0) creditquota from sa_accountclass t1 left join sa_accountbalance t2 on t1.sa_accountclassid=t2.sa_accountclassid and t1.siteid=t2.siteid and t2.sys_enterpriseid="+orderRows.get(0).getLong("pay_enterpriseid")+" where isorder=1 and isused=1 and t1.sa_accountclassid="+orderRows.get(0).getLong("sa_accountclassid")+" and t1.siteid='"+siteid+"'");
|
|
|
- if(xianjinaccountclassrows.isNotEmpty()){
|
|
|
- JSONObject jsonObject =new JSONObject();
|
|
|
+ Rows xianjinaccountclassrows = dbConnect.runSqlQuery("select t1.*,ifnull(t2.balance,0) balance,ifnull(t2.creditquota,0) creditquota from sa_accountclass t1 left join sa_accountbalance t2 on t1.sa_accountclassid=t2.sa_accountclassid and t1.siteid=t2.siteid and t2.sys_enterpriseid=" + orderRows.get(0).getLong("pay_enterpriseid") + " where isorder=1 and isused=1 and t1.sa_accountclassid=" + orderRows.get(0).getLong("sa_accountclassid") + " and t1.siteid='" + siteid + "'");
|
|
|
+ if (xianjinaccountclassrows.isNotEmpty()) {
|
|
|
+ JSONObject jsonObject = new JSONObject();
|
|
|
jsonObject.put("amount", orderSumamount.subtract(firstpayamount));
|
|
|
- jsonObject.put("sa_accountclassid",xianjinaccountclassrows.get(0).getLong("sa_accountclassid"));
|
|
|
- jsonObject.put("accountname",xianjinaccountclassrows.get(0).getString("accountname"));
|
|
|
- jsonObject.put("balance",xianjinaccountclassrows.get(0).getBigDecimal("balance"));
|
|
|
- jsonObject.put("creditquota",xianjinaccountclassrows.get(0).getBigDecimal("creditquota"));
|
|
|
+ jsonObject.put("sa_accountclassid", xianjinaccountclassrows.get(0).getLong("sa_accountclassid"));
|
|
|
+ jsonObject.put("accountname", xianjinaccountclassrows.get(0).getString("accountname"));
|
|
|
+ jsonObject.put("balance", xianjinaccountclassrows.get(0).getBigDecimal("balance"));
|
|
|
+ jsonObject.put("creditquota", xianjinaccountclassrows.get(0).getBigDecimal("creditquota"));
|
|
|
jsonArray.add(jsonObject);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- dbConnect.runSqlUpdate("update sa_order set sa_accountclassinfos='"+jsonArray+"' where sa_orderid="+sa_orderid+" and siteid='"+siteid+"'");
|
|
|
+ dbConnect.runSqlUpdate("update sa_order set sa_accountclassinfos='" + jsonArray + "' where sa_orderid=" + sa_orderid + " and siteid='" + siteid + "'");
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -864,8 +873,8 @@ public class OrderItems extends Controller {
|
|
|
rows.getFieldList().remove("stockstatus");
|
|
|
rows.getFieldList().remove("submitdate");
|
|
|
rows.getFieldList().remove("checkdate");
|
|
|
- Rows rowsrolename= dbConnect.runSqlQuery("select * from sys_userrole t1 inner join sys_role t2 on t1.roleid=t2.roleid and t1.siteid=t2.siteid where t2.rolename='经销商员工' and t1.userid="+userid);
|
|
|
- if(!rowsrolename.isEmpty()){
|
|
|
+ Rows rowsrolename = dbConnect.runSqlQuery("select * from sys_userrole t1 inner join sys_role t2 on t1.roleid=t2.roleid and t1.siteid=t2.siteid where t2.rolename='经销商员工' and t1.userid=" + userid);
|
|
|
+ if (!rowsrolename.isEmpty()) {
|
|
|
rows.getFieldList().remove("price");
|
|
|
rows.getFieldList().remove("amount");
|
|
|
}
|
|
|
@@ -925,8 +934,8 @@ public class OrderItems extends Controller {
|
|
|
titleMap.put("unit", "单位");
|
|
|
titleMap.put("qty", "数量");
|
|
|
titleMap.put("undeliqty", "未发货数量");
|
|
|
- Rows rowsrolename= dbConnect.runSqlQuery("select * from sys_userrole t1 inner join sys_role t2 on t1.roleid=t2.roleid and t1.siteid=t2.siteid where t2.rolename='经销商员工' and t1.userid="+userid);
|
|
|
- if(rowsrolename.isEmpty()){
|
|
|
+ Rows rowsrolename = dbConnect.runSqlQuery("select * from sys_userrole t1 inner join sys_role t2 on t1.roleid=t2.roleid and t1.siteid=t2.siteid where t2.rolename='经销商员工' and t1.userid=" + userid);
|
|
|
+ if (rowsrolename.isEmpty()) {
|
|
|
titleMap.put("price", "单价");
|
|
|
titleMap.put("amount", "金额");
|
|
|
}
|
|
|
@@ -1014,10 +1023,10 @@ public class OrderItems extends Controller {
|
|
|
RowsMap brandRowsMap = Brand.getBrandRowsMap(this, ids);
|
|
|
//价格
|
|
|
HashMap<Long, ItemPrice> itemPriceRowsMap = ItemPrice.getItemPrice(this, sys_enterpriseid, ids);
|
|
|
- Rows sizecustomizedschemes=dbConnect.runSqlQuery("select * from sa_sizecustomizedscheme where siteid='"+siteid+"' ");
|
|
|
- RowsMap sizecustomizedschemesRowsMap=sizecustomizedschemes.toRowsMap("sa_sizecustomizedschemeid");
|
|
|
- Rows sizeschemedetails=dbConnect.runSqlQuery("select * from sa_sizeschemedetail where siteid='"+siteid+"' ");
|
|
|
- RowsMap sizeschemedetailsRowsMap=sizeschemedetails.toRowsMap("sa_sizecustomizedschemeid");
|
|
|
+ Rows sizecustomizedschemes = dbConnect.runSqlQuery("select * from sa_sizecustomizedscheme where siteid='" + siteid + "' ");
|
|
|
+ RowsMap sizecustomizedschemesRowsMap = sizecustomizedschemes.toRowsMap("sa_sizecustomizedschemeid");
|
|
|
+ Rows sizeschemedetails = dbConnect.runSqlQuery("select * from sa_sizeschemedetail where siteid='" + siteid + "' ");
|
|
|
+ RowsMap sizeschemedetailsRowsMap = sizeschemedetails.toRowsMap("sa_sizecustomizedschemeid");
|
|
|
for (Row row : rows) {
|
|
|
row.put("attinfos", attinfoRowsMap.getOrDefault(row.getString("itemid"), new Rows()));
|
|
|
row.put("tradefield", tradefieldRowsMap.getOrDefault(row.getString("itemid"), new Rows()));
|
|
|
@@ -1027,34 +1036,34 @@ public class OrderItems extends Controller {
|
|
|
} else {
|
|
|
row.put("price", 0);
|
|
|
}
|
|
|
- if(row.getLong("widthschemeid")!=0){
|
|
|
- if(sizecustomizedschemesRowsMap.containsKey(row.getString("widthschemeid"))){
|
|
|
- if(sizecustomizedschemesRowsMap.get(row.getString("widthschemeid")).isNotEmpty()){
|
|
|
- row.put("widthtype",sizecustomizedschemesRowsMap.get(row.getString("widthschemeid")).get(0).getString("type"));
|
|
|
- row.put("widthmin",sizecustomizedschemesRowsMap.get(row.getString("widthschemeid")).get(0).getBigDecimal("min"));
|
|
|
- row.put("widthmax",sizecustomizedschemesRowsMap.get(row.getString("widthschemeid")).get(0).getBigDecimal("max"));
|
|
|
- row.put("widthdecimalplaces",sizecustomizedschemesRowsMap.get(row.getString("widthschemeid")).get(0).getBigDecimal("decimalplaces"));
|
|
|
- if(sizeschemedetailsRowsMap.containsKey(row.getString("widthschemeid"))){
|
|
|
- row.put("widthschemedetails",sizeschemedetailsRowsMap.get(row.getString("widthschemeid")));
|
|
|
- }else{
|
|
|
- row.put("widthschemedetails",new JSONArray());
|
|
|
+ if (row.getLong("widthschemeid") != 0) {
|
|
|
+ if (sizecustomizedschemesRowsMap.containsKey(row.getString("widthschemeid"))) {
|
|
|
+ if (sizecustomizedschemesRowsMap.get(row.getString("widthschemeid")).isNotEmpty()) {
|
|
|
+ row.put("widthtype", sizecustomizedschemesRowsMap.get(row.getString("widthschemeid")).get(0).getString("type"));
|
|
|
+ row.put("widthmin", sizecustomizedschemesRowsMap.get(row.getString("widthschemeid")).get(0).getBigDecimal("min"));
|
|
|
+ row.put("widthmax", sizecustomizedschemesRowsMap.get(row.getString("widthschemeid")).get(0).getBigDecimal("max"));
|
|
|
+ row.put("widthdecimalplaces", sizecustomizedschemesRowsMap.get(row.getString("widthschemeid")).get(0).getBigDecimal("decimalplaces"));
|
|
|
+ if (sizeschemedetailsRowsMap.containsKey(row.getString("widthschemeid"))) {
|
|
|
+ row.put("widthschemedetails", sizeschemedetailsRowsMap.get(row.getString("widthschemeid")));
|
|
|
+ } else {
|
|
|
+ row.put("widthschemedetails", new JSONArray());
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
}
|
|
|
- if(row.getLong("lengthschemeid")!=0){
|
|
|
- if(sizecustomizedschemesRowsMap.containsKey(row.getString("lengthschemeid"))){
|
|
|
- if(sizecustomizedschemesRowsMap.get(row.getString("lengthschemeid")).isNotEmpty()){
|
|
|
- row.put("lengthtype",sizecustomizedschemesRowsMap.get(row.getString("lengthschemeid")).get(0).getString("type"));
|
|
|
- row.put("lengthmin",sizecustomizedschemesRowsMap.get(row.getString("lengthschemeid")).get(0).getBigDecimal("min"));
|
|
|
- row.put("lengthmax",sizecustomizedschemesRowsMap.get(row.getString("lengthschemeid")).get(0).getBigDecimal("max"));
|
|
|
- row.put("lengthdecimalplaces",sizecustomizedschemesRowsMap.get(row.getString("lengthschemeid")).get(0).getBigDecimal("decimalplaces"));
|
|
|
- if(sizeschemedetailsRowsMap.containsKey(row.getString("lengthschemeid"))){
|
|
|
- row.put("lengthschemedetails",sizeschemedetailsRowsMap.get(row.getString("lengthschemeid")));
|
|
|
- }else{
|
|
|
- row.put("lengthschemedetails",new JSONArray());
|
|
|
+ if (row.getLong("lengthschemeid") != 0) {
|
|
|
+ if (sizecustomizedschemesRowsMap.containsKey(row.getString("lengthschemeid"))) {
|
|
|
+ if (sizecustomizedschemesRowsMap.get(row.getString("lengthschemeid")).isNotEmpty()) {
|
|
|
+ row.put("lengthtype", sizecustomizedschemesRowsMap.get(row.getString("lengthschemeid")).get(0).getString("type"));
|
|
|
+ row.put("lengthmin", sizecustomizedschemesRowsMap.get(row.getString("lengthschemeid")).get(0).getBigDecimal("min"));
|
|
|
+ row.put("lengthmax", sizecustomizedschemesRowsMap.get(row.getString("lengthschemeid")).get(0).getBigDecimal("max"));
|
|
|
+ row.put("lengthdecimalplaces", sizecustomizedschemesRowsMap.get(row.getString("lengthschemeid")).get(0).getBigDecimal("decimalplaces"));
|
|
|
+ if (sizeschemedetailsRowsMap.containsKey(row.getString("lengthschemeid"))) {
|
|
|
+ row.put("lengthschemedetails", sizeschemedetailsRowsMap.get(row.getString("lengthschemeid")));
|
|
|
+ } else {
|
|
|
+ row.put("lengthschemedetails", new JSONArray());
|
|
|
}
|
|
|
}
|
|
|
|