联调问题修改: 查商品要素定义项仓库id处理

models/wrTrade2.go

@@ -1801,7 +1801,7 @@ func (r *WrStandardFactoryItem) buildSql() string {
 	var sqlId utils.SQLVal = "select t.wrstandardid," +
 		"       dp.dgfactoryitemtypeid," +
 		"       dp.itemtypename," +
-		"       di.dgfactoryitemid," +
+		"       decode(dp.dgfactoryitemtypeid,1,di.warehouseid,di.dgfactoryitemid) dgfactoryitemid," +
 		"       di.dgfactoryitemvalue" +
 		"  from wrstandardfactoryitem t" +
 		" inner join wrstandard w" +