|
@@ -13,6 +13,7 @@ import common.annotation.API;
|
|
|
import common.annotation.CACHEING;
|
|
import common.annotation.CACHEING;
|
|
|
import common.annotation.CACHEING_CLEAN;
|
|
import common.annotation.CACHEING_CLEAN;
|
|
|
import common.data.*;
|
|
import common.data.*;
|
|
|
|
|
+import org.apache.commons.lang.StringUtils;
|
|
|
import restcontroller.R;
|
|
import restcontroller.R;
|
|
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
@@ -151,7 +152,7 @@ public class stockbillitems extends Controller {
|
|
|
Long st_stockbillid = content.getLong("st_stockbillid");
|
|
Long st_stockbillid = content.getLong("st_stockbillid");
|
|
|
JSONArray iteminfos = content.getJSONArray("iteminfos");
|
|
JSONArray iteminfos = content.getJSONArray("iteminfos");
|
|
|
ArrayList<String> sqlList = new ArrayList<>();
|
|
ArrayList<String> sqlList = new ArrayList<>();
|
|
|
- Rows rowscount = dbConnect.runSqlQuery("select billno,status,sourceobject,stockid,type from st_stockbill where st_stockbillid=" + st_stockbillid);
|
|
|
|
|
|
|
+ Rows rowscount = dbConnect.runSqlQuery("select billno,status,sourceobject,stockid,type,name,phonenumber,address from st_stockbill where st_stockbillid=" + st_stockbillid);
|
|
|
if (!rowscount.isEmpty()) {
|
|
if (!rowscount.isEmpty()) {
|
|
|
if (!rowscount.get(0).getString("status").equals("新建")) {
|
|
if (!rowscount.get(0).getString("status").equals("新建")) {
|
|
|
return getErrReturnObject().setErrMsg("非新建状态的出库单无法新增修改").toString();
|
|
return getErrReturnObject().setErrMsg("非新建状态的出库单无法新增修改").toString();
|
|
@@ -207,6 +208,12 @@ public class stockbillitems extends Controller {
|
|
|
}else{
|
|
}else{
|
|
|
insertSQL.setValue("stockid", stockRowsMap.get("101").get(0).getLong("stockid"));
|
|
insertSQL.setValue("stockid", stockRowsMap.get("101").get(0).getLong("stockid"));
|
|
|
}
|
|
}
|
|
|
|
|
+ }else if(rowscount.get(0).getString("type").equals("其他出库")){
|
|
|
|
|
+ if(rowscount.get(0).getLong("stockid")!=0){
|
|
|
|
|
+ insertSQL.setValue("stockid", rowscount.get(0).getLong("stockid"));
|
|
|
|
|
+ }else{
|
|
|
|
|
+ insertSQL.setValue("stockid",itemRowsMap.containsKey(iteminfo.getStringValue("itemid"))?itemRowsMap.get(iteminfo.getStringValue("itemid")).get(0).getLong("stockid"):iteminfo.getLongValue("stockid"));
|
|
|
|
|
+ }
|
|
|
}else{
|
|
}else{
|
|
|
insertSQL.setValue("stockid", iteminfo.getLong("stockid"));
|
|
insertSQL.setValue("stockid", iteminfo.getLong("stockid"));
|
|
|
}
|
|
}
|
|
@@ -230,6 +237,14 @@ public class stockbillitems extends Controller {
|
|
|
insertSQL.setValue("untaxedamount", iteminfo.getBigDecimal("qty").multiply(iteminfo.getBigDecimal("price").divide(new BigDecimal(1.13),2, BigDecimal.ROUND_HALF_UP)));
|
|
insertSQL.setValue("untaxedamount", iteminfo.getBigDecimal("qty").multiply(iteminfo.getBigDecimal("price").divide(new BigDecimal(1.13),2, BigDecimal.ROUND_HALF_UP)));
|
|
|
insertSQL.setValue("skucontrol", itemRowsMap.containsKey(iteminfo.getStringValue("itemid"))?itemRowsMap.get(iteminfo.getStringValue("itemid")).get(0).getBoolean("skucontrol"):iteminfo.getBoolean("skucontrol"));
|
|
insertSQL.setValue("skucontrol", itemRowsMap.containsKey(iteminfo.getStringValue("itemid"))?itemRowsMap.get(iteminfo.getStringValue("itemid")).get(0).getBoolean("skucontrol"):iteminfo.getBoolean("skucontrol"));
|
|
|
i++;
|
|
i++;
|
|
|
|
|
+ if(StringUtils.isBlank(rowscount.get(0).getString("name"))
|
|
|
|
|
+ || StringUtils.isBlank(rowscount.get(0).getString("phonenumber"))
|
|
|
|
|
+ || StringUtils.isBlank(rowscount.get(0).getString("address"))){
|
|
|
|
|
+ Rows orderRows =dbConnect.runSqlQuery("select * from sa_order where sa+sa_orderid="+iteminfo.getLongValue("sa_orderid"));
|
|
|
|
|
+ if(orderRows.isNotEmpty()){
|
|
|
|
|
+ sqlList.add("update st_stockbill set name='"+orderRows.get(0).getString("contact")+"',phonenumber='"+orderRows.get(0).getString("phonenumber")+"',address='"+orderRows.get(0).getString("address")+"' where st_stockbillid="+st_stockbillid);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
sqlList.add(insertSQL.getSQL());
|
|
sqlList.add(insertSQL.getSQL());
|
|
|
} else {
|
|
} else {
|
|
|
Rows rows = dbConnect.runSqlQuery(
|
|
Rows rows = dbConnect.runSqlQuery(
|