|
|
@@ -185,7 +185,8 @@ public class Item extends Controller {
|
|
|
sqlFactory.addParameter("customprice", content.getBigDecimalValue("customprice"));
|
|
|
sqlFactory.addParameter("widthschemeid", content.getBigDecimalValue("widthschemeid"));
|
|
|
sqlFactory.addParameter("lengthschemeid", content.getBigDecimalValue("lengthschemeid"));
|
|
|
- sqlFactory.addParameter("pricingmetod", content.getLongValue("pricingmetod") == 0 ? 1 : content.getLongValue("pricingmetod"));
|
|
|
+ Long pricingmetod = content.getLongValue("pricingmetod");
|
|
|
+ sqlFactory.addParameter("pricingmetod", pricingmetod == 0 ? 1 : pricingmetod);
|
|
|
|
|
|
//德莱宝,工艺定义方案id
|
|
|
sqlFactory.addParameter("cheekschemeid", content.getBigDecimalValue("cheekschemeid"));
|
|
|
@@ -223,7 +224,11 @@ public class Item extends Controller {
|
|
|
sqlFactory.addParameter("isbutterfly", content.getBooleanValue("isbutterfly"));
|
|
|
sqlFactory.addParameter("erpitemno", content.getStringValue("erpitemno"));
|
|
|
sqlFactory.addParameter("erpitemname", content.getStringValue("erpitemname"));
|
|
|
- sqlFactory.addParameter("specalnote", content.getStringValue("specalnote"));
|
|
|
+ String specalnote = content.getStringValue("specalnote");
|
|
|
+ if (pricingmetod == 1 && !specalnote.contains("此商品单价为平方价")) {
|
|
|
+ specalnote = "此商品单价为平方价;" + specalnote;
|
|
|
+ }
|
|
|
+ sqlFactory.addParameter("specalnote", specalnote);
|
|
|
sqlFactory.addParameter("prodline", content.getStringValue("prodline"));
|
|
|
sqlFactory.addParameter("device", content.getStringValue("device"));
|
|
|
|
|
|
@@ -320,7 +325,7 @@ public class Item extends Controller {
|
|
|
|
|
|
ERPDocking erpDocking = new ERPDocking(siteid);
|
|
|
JSONArray jsonArray = new JSONArray();
|
|
|
- if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") ) {
|
|
|
+ if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true")) {
|
|
|
if (!rows.toJsonArray("itemno").isEmpty()) {
|
|
|
jsonArray = erpDocking.getErpIcinvbalRows(200000, 1, rows.toJsonArray("itemno"));
|
|
|
}
|
|
|
@@ -401,7 +406,7 @@ public class Item extends Controller {
|
|
|
// }
|
|
|
ERPDocking erpDocking = new ERPDocking(siteid);
|
|
|
JSONArray jsonArray = new JSONArray();
|
|
|
- if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true") ) {
|
|
|
+ if (Parameter.get("system.ccerp_dockswitch").equalsIgnoreCase("true")) {
|
|
|
if (!rows.toJsonArray("itemno").isEmpty()) {
|
|
|
jsonArray = erpDocking.getErpIcinvbalRows(200000, 1, rows.toJsonArray("itemno"));
|
|
|
}
|