|
|
@@ -236,8 +236,8 @@ public class toolscode extends Controller {
|
|
|
if (itemid != rows.get(0).getLong("itemid")) {
|
|
|
newitemid = itemid;
|
|
|
olditemid = rows.get(0).getLong("itemid");
|
|
|
- if(rows.get(0).getLong("wmsuploadflag")==2){
|
|
|
- sqlList.add("update sa_itemsku set wmsuploadflag=1 where sa_itemskuid="+sa_itemskuid+" and siteid='"+siteid+"'");
|
|
|
+ if (rows.get(0).getLong("wmsuploadflag") == 2) {
|
|
|
+ sqlList.add("update sa_itemsku set wmsuploadflag=1 where sa_itemskuid=" + sa_itemskuid + " and siteid='" + siteid + "'");
|
|
|
}
|
|
|
if (StringUtils.isBlank(content.getStringValue("changenotes"))) {
|
|
|
return getErrReturnObject().setErrMsg("变更商品信息时,需填写变更原因").toString();
|
|
|
@@ -326,8 +326,7 @@ public class toolscode extends Controller {
|
|
|
}
|
|
|
Rows skuRows = skuQuery.query();
|
|
|
if (skuRows.isNotEmpty()) {
|
|
|
-
|
|
|
- RowsMap itemRowsMap = SQLFactory.createQuerySQL(this, "plm_item", "itemid", "itemno", "itemname", "spec", "model", "marketingcategory", "stockno").setWhere("itemid", skuRows.toArrayList("itemid")).query().toRowsMap("itemid");
|
|
|
+ RowsMap itemRowsMap = SQLFactory.createQuerySQL(this, "plm_item", "itemid", "itemno", "itemname", "spec", "model", "topclassnum", "stockno").addJoinTable(JOINTYPE.left, "plm_unit", "plm_unit", "plm_unit.unitid=plm_item.unitid", "unitname").setWhere("itemid", skuRows.toArrayList("itemid")).query().toRowsMap("itemid");
|
|
|
RowsMap agentsRowsMap = SQLFactory.createQuerySQL(this, "sa_agents", "sa_agentsid", "agentnum").addJoinTable(JOINTYPE.inner, "sys_enterprise", "sys_enterprise", "sa_agentsid=:sa_agentsid", "enterprisename").setWhere("sa_agentsid", skuRows.toArrayList("sa_agentsid")).query().toRowsMap("sa_agentsid");
|
|
|
RowsMap stockRowsMap = SQLFactory.createQuerySQL(this, "st_stock", "stockid", "stockno", "stockname").setWhere("stockid", skuRows.toArrayList("stockid")).query().toRowsMap("stockid");
|
|
|
RowsMap skuChangeRowsMap = SQLFactory.createQuerySQL(this, "sa_itemsku_change", "sa_itemskuid", "changenotes").setWhere("sa_itemskuid", skuRows.toArrayList("sa_itemskuid")).setOrderBy("sa_itemsku_changeid desc").query().toRowsMap("sa_itemskuid");
|
|
|
@@ -340,8 +339,9 @@ public class toolscode extends Controller {
|
|
|
skuRow.put("itemname", itemRow.getString("itemname"));
|
|
|
skuRow.put("spec", itemRow.getString("spec"));
|
|
|
skuRow.put("model", itemRow.getString("model"));
|
|
|
- skuRow.put("marketingcategory", itemRow.getString("marketingcategory"));
|
|
|
+ skuRow.put("topclassnum", itemRow.getString("topclassnum"));
|
|
|
skuRow.put("itemstockno", itemRow.getString("stockno"));
|
|
|
+ skuRow.put("unit", itemRow.getString("unitname"));
|
|
|
}
|
|
|
String sa_agentsid = skuRow.getString("sa_agentsid");
|
|
|
if (agentsRowsMap.containsKey(sa_agentsid) && agentsRowsMap.get(sa_agentsid).isNotEmpty()) {
|