diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java index e284ef2b..90496027 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java @@ -33,6 +33,7 @@ public class BussinessTypResponse { private boolean checkPc; private boolean checkWebNew; private boolean checkChange; + private boolean checkSp; private boolean secCheckUdims; private boolean secCheckPdaEd; @@ -76,4 +77,6 @@ public class BussinessTypResponse { private boolean secCheckCopy; private boolean checkSelect; //判断多选框是否勾选 + + private boolean secCheckSp; //自助平台同步 } diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml index 58ba333c..5147c8fc 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml @@ -327,6 +327,7 @@ checkPc=#{checkPc}, checkWebNew=#{checkWebNew}, checkChange=#{checkChange}, + checkSp=#{checkSp}, secCheckUdims=#{secCheckUdims}, secCheckPdaEd=#{secCheckPdaEd}, secCheckPdaUn=#{secCheckPdaUn}, @@ -335,6 +336,7 @@ secCheckChange=#{secCheckChange}, checkBalacne=#{checkBalacne}, secCheckBalacne=#{secCheckBalacne}, + secCheckSp=#{secCheckSp}, index=#{index}, corpType=#{corpType}, storageCode=#{storageCode}, diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml index f0d8d70d..a58c7f4b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml @@ -200,7 +200,7 @@ GROUP BY #{groupType} - group by inv_prein_product.id + group by inv_prein_product.orderIdFk order by inv_prein_product.updateTime desc