合并master分支

src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java

@@ -33,7 +33,6 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.*;
-import java.util.stream.Collectors;
 
 @RestController
 public class InvWarehouseController extends BaseController {
@@ -132,7 +131,9 @@ public class InvWarehouseController extends BaseController {
             return ResultVOUtils.error(500, "当前仓库不能为空！");
         }
         FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest();
-        filterInvSubWarehouseRequest.setAdvanceType(1);
+        if(filterInvWarehouseRequest.getType()==null){
+            filterInvSubWarehouseRequest.setAdvanceType(1);
+        }
         List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterInvSubWarehouse(filterInvSubWarehouseRequest);
         List<InvWarehouseEntity> results = new ArrayList<>();
         if (CollUtil.isNotEmpty(invWarehouseEntities)) {
@@ -271,6 +272,13 @@ public class InvWarehouseController extends BaseController {
         if (userCount > 0) {
             return ResultVOUtils.error(500, "修改失败,请先移除该仓库关联用户！");
         }
+        // 先判断是否有相同名字的仓库
+        boolean checkResult = invWarehouseService.checkDuplicateName(invWarehouseEntity.getParentId(), invWarehouseEntity.getName());
+        if (checkResult) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "仓库名称重复！");
+        }
+
+
 
         //更新仓库信息
         invWarehouseEntity.setUpdateTime(new Date());

src/main/java/com/glxp/api/controller/auth/SysUserController.java

@@ -276,6 +276,8 @@ public class SysUserController extends BaseController {
             for (DeptUserEntity deptUserEntity : deptUserEntities) {
                 if(deptUserEntity.getDeptId() == 1){
                     checkDeptId=true;
+                }else{
+                    deptCodeList.add(deptUserEntity.getDeptId());
                 }
             }
             if(checkDeptId==false){

src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java

@@ -385,8 +385,8 @@ public class IoPurChangeService {
                 ioOrderEntity.setUpdateTime(new Date());
                 ioOrderEntity.setUpdateUser(purPlanEntity.getCreateUser());
                 ioOrderEntity.setCustomerId("110");
-                ioOrderEntity.setDeptCode(purPlanEntity.getInvCode());
-                ioOrderEntity.setInvCode(purPlanEntity.getDeptCode());
+                ioOrderEntity.setDeptCode(purPlanEntity.getDeptCode());
+                ioOrderEntity.setInvCode(purPlanEntity.getInvCode());
                 ioOrderService.insertOrder(ioOrderEntity);
                 billNo += ioOrderEntity.getBillNo() + ",";
                 //插入业务单表

src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java

@@ -31,4 +31,5 @@ public class FilterInvWarehouseRequest extends ListPageRequest {
     private String superiorCode;//上级
     private String subordinateCode;//下级
     private String superiorPcode;//上级
+    private Integer type;
 }

src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java

@@ -70,6 +70,7 @@ public class UdiRelevanceResponse {
     private Boolean allowNoBatch;
     private Boolean allowNoExpire;
     private Boolean allowNoProduct;
+    private Boolean allowNoSerial;
     private String spmc;
     private String cplx;
     private String hchzsb;

src/main/java/com/glxp/api/res/inout/IoOrderResponse.java

@@ -220,6 +220,9 @@ public class IoOrderResponse {
     private Integer processStatus;
     private int inCodeStatus;
 
+    private Date checkTime;
+    private String checkUserName;
+
 
     /**
      * 校验信息

src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java

@@ -112,7 +112,7 @@ public class BasicCorpServiceImpl implements BasicCorpService {
         if (CollUtil.isNotEmpty(list)) {
             if (null != basicCorpEntity.getId()) {
                 for (BasicCorpEntity corpEntity : list) {
-                    if (corpEntity.getId() != basicCorpEntity.getId()) {
+                    if (!corpEntity.getId().equals(basicCorpEntity.getId())) {
                         return true;
                     }
                 }

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -646,7 +646,7 @@ public class IoOrderServiceImpl implements IoOrderService {
                 filterOrderRequest.setDealStatuses(Arrays.asList(1, 2, 3, 4));
                 break;
             case Constant.ORDER_STATUS_WAIT_AUDITED:
-                filterOrderRequest.setStatuses(Arrays.asList(10, 7));
+                filterOrderRequest.setStatuses(Arrays.asList(10));
                 filterOrderRequest.setDealStatuses(Arrays.asList(3, 4));
                 break;
             case Constant.ORDER_STATUS_UN_ALLOCATE:

src/main/resources/mybatis/mapper/auth/DeptUserDao.xml

@@ -78,7 +78,7 @@
     <delete id="deleteByUser" parameterType="java.lang.Long">
         delete
         from auth_dept_user
-        where userId = #{userId}
+        where userId = #{userId} and deptId != 1
     </delete>
     <delete id="delete" parameterType="java.lang.Long">
         delete

src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml

@@ -96,6 +96,7 @@
                bp.zczbhhzbapzbh,
                bp.ylqxzcrbarmc,
                bp.nameCode,
+               bp.manufactory,
                ad.name        deptName,
                aw.name        invName,
                sp.name        invSpaceName
@@ -117,6 +118,7 @@
                 AND pd.invSpaceCode = #{invSpaceCode}
             </if>
         </where>
+        group by pd.code
     </select>
 
     <update id="batchBindSpace">

src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml

@@ -64,6 +64,9 @@
             <if test="applyType != null">
                 AND generatePlan = 1
             </if>
+            <if test="emergency != null">
+                AND emergency = #{emergency}
+            </if>
         </where>
 
     </select>
@@ -142,4 +145,4 @@
         WHERE id = #{id}
     </update>
 
-</mapper>
+</mapper>

src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml

@@ -27,8 +27,8 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, billNo, billDate, `status`, billType, remark, invCode, deptCode, `createUser`, 
-    createTime, auditUser, auditTime, auditRemark, updateTime, updateUser, applyCreateUser, 
+    id, billNo, billDate, `status`, billType, remark, invCode, deptCode, `createUser`,
+    createTime, auditUser, auditTime, auditRemark, updateTime, updateUser, applyCreateUser,
     applyAuditUser, applyRemark, applyBillNo, stockOrderNo
   </sql>
 
@@ -86,9 +86,12 @@
       <if test="createUser != '' and createUser != null">
         AND createUser = #{createUser}
       </if>
+      <if test="emergency != null">
+        AND emergency = #{emergency}
+      </if>
     </where>
 
   </select>
 
 
-</mapper>
+</mapper>

src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml

@@ -58,6 +58,9 @@
             <if test="createUser != '' and createUser != null">
                 AND createUser = #{createUser}
             </if>
+            <if test="emergency != null">
+                AND emergency = #{emergency}
+            </if>
         </where>
 
     </select>
@@ -138,4 +141,4 @@
         WHERE id = #{id}
     </delete>
 
-</mapper>
+</mapper>

src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml

@@ -36,7 +36,7 @@
                 AND thirdSysFk = #{thirdSysFk}
             </if>
             <if test="thirdSys != '' and thirdSys != null">
-                AND thirdSys = #{thirdSys}
+                AND thirdSysFk = #{thirdSys}
             </if>
             <if test="supName != '' and supName != null">
                 AND supName LIKE concat('%',#{supName},'%')