|
|
@@ -1323,8 +1323,10 @@ public class OrderItems extends Controller {
|
|
|
itemquery.addJoinTable(JOINTYPE.left, "plm_itemextend", "t3", "t1.itemid=t3.itemid ", "material", "erpitemno", "erpitemname", "specalnote", "prodline", "device");
|
|
|
itemquery.addJoinTable(JOINTYPE.left, "plm_unit", "t4", "t1.unitid=t4.unitid ");
|
|
|
itemquery.addJoinTable(JOINTYPE.left, "plm_unit", "t5", "t5.unitid=t2.auxunitid ");
|
|
|
- if (!type.equals("特殊订单") && Enterprise.getEnterprise(this, order_sys_enterpriseid).getBoolean("saleclassauth")) {
|
|
|
- itemquery.addJoinTable(JOINTYPE.inner, "sys_enterprise_itemauth_view", "t6", "t1.itemid=t6.itemid and t6.sys_enterpriseid=" + order_sys_enterpriseid);
|
|
|
+ if (!ismanage) {
|
|
|
+ if (!type.equals("特殊订单") && Enterprise.getEnterprise(this, order_sys_enterpriseid).getBoolean("saleclassauth")) {
|
|
|
+ itemquery.addJoinTable(JOINTYPE.inner, "sys_enterprise_itemauth_view", "t6", "t1.itemid=t6.itemid and t6.sys_enterpriseid=" + order_sys_enterpriseid);
|
|
|
+ }
|
|
|
}
|
|
|
itemquery.addQueryFields("unit", "t4.unitname");
|
|
|
itemquery.addQueryFields("auxunit", "t5.unitname");
|
|
|
@@ -1585,7 +1587,7 @@ public class OrderItems extends Controller {
|
|
|
// }
|
|
|
|
|
|
|
|
|
-// @API(title = "订单商品变更（手动推erp）", apiversion = R.ID20230306161703.v1.class)
|
|
|
+ // @API(title = "订单商品变更（手动推erp）", apiversion = R.ID20230306161703.v1.class)
|
|
|
// @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class})
|
|
|
// public String changeItem1() throws YosException {
|
|
|
// if (Parameter.getBoolean("system.erp_dockswitch")) {
|
