1.同步busUser分支的bug修复

api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java

@@ -141,6 +141,10 @@ public class InvSubWarehouseController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
 
+        boolean checkResult = invSubWarehouseService.checkDuplicateName(invSubWarehouseEntity.getParentId(), invSubWarehouseEntity.getName());
+        if (checkResult) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "分库名称重复！");
+        }
 
         FilterInvSubWarehouseRequest filterInvWarehouseRequest = new FilterInvSubWarehouseRequest();
         filterInvWarehouseRequest.setParentId(invSubWarehouseEntity.getParentId());

api-admin/src/main/java/com/glxp/api/admin/req/inventory/InnerOrderRequest.java

@@ -6,6 +6,9 @@ import lombok.Data;
 @Data
 public class InnerOrderRequest extends ListPageRequest {
 
-
     private String recordKey;
+
+    private String startDate;
+
+    private String endDate;
 }

api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java

@@ -76,4 +76,8 @@ public class BussinessTypResponse {
     private boolean secCheckCopy;
 
     private boolean checkSelect; //判断多选框是否勾选
+
+    private boolean checkSp;
+
+    private boolean secCheckSp; //自助平台同步
 }

api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml

@@ -327,12 +327,14 @@
             <if test="checkPc != null">checkPc=#{checkPc},</if>
             <if test="checkWebNew != null">checkWebNew=#{checkWebNew},</if>
             <if test="checkChange != null">checkChange=#{checkChange},</if>
+            <if test="checkSp != null">checkSp=#{checkSp},</if>
             <if test="secCheckUdims != null">secCheckUdims=#{secCheckUdims},</if>
             <if test="secCheckPdaEd != null">secCheckPdaEd=#{secCheckPdaEd},</if>
             <if test="secCheckPdaUn != null">secCheckPdaUn=#{secCheckPdaUn},</if>
             <if test="secCheckPc != null">secCheckPc=#{secCheckPc},</if>
             <if test="secCheckWebNew != null">secCheckWebNew=#{secCheckWebNew},</if>
             <if test="secCheckChange != null">secCheckChange=#{secCheckChange},</if>
+            <if test="secCheckSp != null">secCheckSp=#{secCheckSp},</if>
             <if test="checkBalacne != null">checkBalacne=#{checkBalacne},</if>
             <if test="secCheckBalacne != null">secCheckBalacne=#{secCheckBalacne},</if>
             <if test="index != null">index=#{index},</if>

api-admin/src/main/resources/mybatis/mapper/inventory/InnerOrderDao.xml

@@ -12,8 +12,11 @@
             <if test="recordKey != '' and recordKey != null">
                 AND recordKey = #{recordKey}
             </if>
+            <if test="startDate != null and startDate != '' and endDate != null and endDate != ''">
+                AND date_format(inv_inner_order.createTime, '%Y-%m-%d') between date_format(#{startDate},
+                '%Y-%m-%d') and date_format(#{endDate}, '%Y-%m-%d')
+            </if>
         </where>
-
     </select>
 
     <insert id="insert" keyProperty="id"

api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml

@@ -200,7 +200,7 @@
         <if test="groupType != '' and groupType != null">
             GROUP BY #{groupType}
         </if>
-        group by inv_prein_product.id
+        group by inv_prein_product.orderIdFk
         order by inv_prein_product.updateTime desc
     </select>
     <insert id="insertInvProduct" keyProperty="id"