Merge remote-tracking branch 'origin/dev' into dev

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

@@ -84,6 +84,13 @@ public class SysRoleController extends BaseController {
      */
     @PutMapping
     public BaseResponse edit(@Validated @RequestBody SysRole role) {
+        //把角色改成禁用的时候 如果存在关联 不能禁用
+        if("1".equals(role.getStatus())){
+            List<SysUserRole> sysUserRoles = roleService.selectUserRoleList(role.getRoleId());
+            if( !sysUserRoles.isEmpty()){
+                return ResultVOUtils.error(500, "角色已关联用户,不能禁用！");
+            }
+        }
         roleService.checkRoleAllowed(role);
         roleService.checkRoleDataScope(role.getRoleId());
         if (Constant.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {

src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java

@@ -87,7 +87,7 @@ public class BasicGenExcelService {
             List<Long> ids = basicCorpsExportRequest.getIds();
             for (Long id : ids) {
                 BasicUnitMaintainFilterRequest filterRequest = new BasicUnitMaintainFilterRequest();
-                filterRequest.setId(id);
+                filterRequest.setId(id.longValue());
                 List<List<String>> genDatas = genExcelData(filterRequest);
                 if (genDatas != null && genDatas.size() > 0) {
                     excelData.addAll(genDatas);

src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java

@@ -67,7 +67,7 @@ public class BasicGenJsonService {
             List<Long> ids = basicCorpsExportRequest.getIds();
             ids.forEach(id -> {
                 BasicUnitMaintainFilterRequest request = new BasicUnitMaintainFilterRequest();
-                request.setId(id);
+                request.setId(id.longValue());
                 List<BasicCorpEntity> basicUnitMaintainEntities = basicUnitMaintainService.filterList(request);
                 unitMaintainEntities.addAll(basicUnitMaintainEntities);
                 getThrCorpList(exportData, basicUnitMaintainEntities);
@@ -96,7 +96,7 @@ public class BasicGenJsonService {
             List<Long> ids = corpsExportRequest.getIds();
             ids.forEach(id -> {
                 BasicUnitMaintainFilterRequest request = new BasicUnitMaintainFilterRequest();
-                request.setId(id);
+                request.setId(id.longValue());
                 List<BasicCorpEntity> basicUnitMaintainEntities = basicUnitMaintainService.filterList(request);
                 unitMaintainEntities.addAll(basicUnitMaintainEntities);
                 getThrCorpList(exportData, basicUnitMaintainEntities);

src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java

@@ -13,6 +13,7 @@ import com.glxp.api.entity.inout.IoOrderEntity;
 import com.glxp.api.entity.purchase.SupCertEntity;
 import com.glxp.api.entity.purchase.SupManufacturerEntity;
 import com.glxp.api.entity.purchase.SupProductEntity;
+import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity;
 import com.glxp.api.entity.system.SystemPDFModuleEntity;
 import com.glxp.api.entity.system.SystemPDFTemplateEntity;
 import com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity;
@@ -30,6 +31,7 @@ import com.glxp.api.service.inout.IoCodeService;
 import com.glxp.api.service.inout.IoOrderDetailBizService;
 import com.glxp.api.service.inout.IoOrderService;
 import com.glxp.api.service.system.SystemPDFModuleService;
+import com.glxp.api.service.system.SystemPDFTemplateRelevanceCodeService;
 import com.glxp.api.service.system.SystemPDFTemplateRelevanceService;
 import com.glxp.api.service.system.SystemPDFTemplateService;
 import com.glxp.api.util.JasperUtils;
@@ -71,6 +73,8 @@ public class BasicOrderPrintController {
     IoCodeService ioCodeService;
     @Value("${file_path}")
     private String filePath;
+    @Resource
+    SystemPDFTemplateRelevanceCodeService systemPDFTemplateRelevanceCodeService;
 
     //校验模板是否正确
     @AuthRuleAnnotation("")
@@ -78,9 +82,10 @@ public class BasicOrderPrintController {
     public BaseResponse inspectionStockOrderPDFFromTemplateFile(@RequestBody FilterOrderPrintRequest filterOrderPrintRequest) {
 
 
-        SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntityt = systemPDFTemplateRelevanceService.selectModuleldAndAction(filterOrderPrintRequest.getModuleId(), filterOrderPrintRequest.getAction());
+        String name=getStatusName(filterOrderPrintRequest.getStatus());
-        if (systemPDFTemplateRelevanceEntityt != null) {
+        SysPdfTemplateRelevanceCodeEntity sysPdfTemplateRelevanceCodeEntity = systemPDFTemplateRelevanceCodeService.selectNameAndAction(name, filterOrderPrintRequest.getAction());
-            SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(systemPDFTemplateRelevanceEntityt.getTemplateId() + "");
+        if (sysPdfTemplateRelevanceCodeEntity != null) {
+            SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(sysPdfTemplateRelevanceCodeEntity.getTemplateId() + "");
             if (systemPDFTemplateEntity == null) {
                 return ResultVOUtils.error(999, "所属模板错误！");
             } else {
@@ -97,7 +102,8 @@ public class BasicOrderPrintController {
     @PostMapping("/udiwms/pdf/template/order/file")
     public void printSupCertProduction(@RequestBody FilterOrderPrintRequest filterOrderPrintRequest, HttpServletRequest request, HttpServletResponse response) throws Exception {
         SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(filterOrderPrintRequest.getTemplateId());
-        SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntityt = systemPDFTemplateRelevanceService.selectModuleldAndAction(filterOrderPrintRequest.getModuleId(), filterOrderPrintRequest.getAction());
+        String name=getStatusName(filterOrderPrintRequest.getStatus());
+        SysPdfTemplateRelevanceCodeEntity sysPdfTemplateRelevanceCodeEntity = systemPDFTemplateRelevanceCodeService.selectNameAndAction(name, filterOrderPrintRequest.getAction());
         //打印单号标签
         Map<String, Object> data = new HashMap<>(1);
         List<Object> list = new ArrayList<>();
@@ -125,8 +131,8 @@ public class BasicOrderPrintController {
                     bizData.put("locInv", ioOrderResponse.getInvName() == null ? ' ' : ioOrderResponse.getInvName());
                     bizData.put("billNo", ioOrderResponse.getBillNo() == null ? ' ' : ioOrderResponse.getBillNo());
                     bizData.put("billdate", formatter.format(ioOrderResponse.getCreateTime()));
-                    bizData.put("remark1", systemPDFTemplateRelevanceEntityt.getRemark1() == null ? ' ' : systemPDFTemplateRelevanceEntityt.getRemark1());
+                    bizData.put("remark1", sysPdfTemplateRelevanceCodeEntity.getRemark1() == null ? ' ' : sysPdfTemplateRelevanceCodeEntity.getRemark1());
-                    bizData.put("remark2", systemPDFTemplateRelevanceEntityt.getRemark2() == null ? ' ' : systemPDFTemplateRelevanceEntityt.getRemark2());
+                    bizData.put("remark2", sysPdfTemplateRelevanceCodeEntity.getRemark2() == null ? ' ' : sysPdfTemplateRelevanceCodeEntity.getRemark2());
                     bizData.put("productName", udiProductEntity.getCpms() == null ? ' ' : udiProductEntity.getCpms());
                     bizData.put("spmc", obj.getCoName() == null ? ' ' : obj.getCoName());
                     bizData.put("spec", obj.getSpec() == null ? ' ' : obj.getSpec());
@@ -174,8 +180,8 @@ public class BasicOrderPrintController {
                     bizData.put("locInv", ioOrderResponse.getInvName() == null ? ' ' : ioOrderResponse.getInvName());
                     bizData.put("billNo", ioOrderResponse.getBillNo() == null ? ' ' : ioOrderResponse.getBillNo());
                     bizData.put("billdate", formatter.format(ioOrderResponse.getCreateTime()));
-                    bizData.put("remark1", systemPDFTemplateRelevanceEntityt.getRemark1() == null ? ' ' : systemPDFTemplateRelevanceEntityt.getRemark1());
+                    bizData.put("remark1", sysPdfTemplateRelevanceCodeEntity.getRemark1() == null ? ' ' : sysPdfTemplateRelevanceCodeEntity.getRemark1());
-                    bizData.put("remark2", systemPDFTemplateRelevanceEntityt.getRemark2() == null ? ' ' : systemPDFTemplateRelevanceEntityt.getRemark2());
+                    bizData.put("remark2", sysPdfTemplateRelevanceCodeEntity.getRemark2() == null ? ' ' : sysPdfTemplateRelevanceCodeEntity.getRemark2());
                     bizData.put("productName", udiProductEntity.getCpms() == null ? ' ' : udiProductEntity.getCpms());
                     bizData.put("spmc", ioOrderDetailBizEntity.getCoName() == null ? ' ' : ioOrderDetailBizEntity.getCoName());
                     bizData.put("spec", ioOrderDetailBizEntity.getSpec() == null ? ' ' : ioOrderDetailBizEntity.getSpec());
@@ -198,7 +204,21 @@ public class BasicOrderPrintController {
 
         data.put("data", list);
         String param = JSON.toJSONString(data);
-        JasperUtils.jasperReport(request, response, param, filePath + "/pdf/template/"+systemPDFTemplateEntity.getPath(), "pdf");
+        JasperUtils.jasperReport(request, response, param, systemPDFTemplateEntity.getPath(), "pdf");
+    }
+
+    public  String getStatusName(Integer type){
+        String name="";
+        if(type==3){
+            name="ScanCodeVerification";
+        }else  if(type==5){
+            name="ScanCodeCheck";
+        }else  if(type==10){
+            name="ScanCode";
+        }else  if(type==7){
+            name="ScanCodeAlready";
+        }
+        return name;
     }
 
 }

src/main/java/com/glxp/api/dao/auth/SysUserRoleMapper.java

@@ -15,4 +15,7 @@ public interface SysUserRoleMapper {
 
     int insertBatch(@Param("sysUserRoles") List<SysUserRole> sysUserRoles);
 
+    List<SysUserRole> selectUserRoleList(Long roleId);
+
+
 }

src/main/java/com/glxp/api/req/basic/FilterOrderPrintRequest.java

@@ -14,5 +14,6 @@ public class FilterOrderPrintRequest {
    private  Integer type;
    private  String templateId;
    private  String orderIdFk;
+   private  Integer status;
 
 }

src/main/java/com/glxp/api/res/inv/InvPreProductResponse.java

@@ -105,4 +105,6 @@ public class InvPreProductResponse {
      */
     private String invCode;
 
+    private String measname;
+
 }

src/main/java/com/glxp/api/service/auth/ISysRoleService.java

@@ -85,6 +85,8 @@ public interface ISysRoleService {
      */
     void checkRoleAllowed(SysRole role);
 
+    List<SysUserRole> selectUserRoleList(Long roleId);
+
     /**
      * 校验角色是否有数据权限
      *

src/main/java/com/glxp/api/service/auth/impl/SysRoleServiceImpl.java

@@ -4,8 +4,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageHelper;
-import com.glxp.api.common.res.BaseResponse;
-import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.Constant;
 import com.glxp.api.dao.auth.SysRoleMapper;
 import com.glxp.api.dao.auth.SysRoleMenuMapper;
@@ -187,6 +185,11 @@ public class SysRoleServiceImpl implements ISysRoleService {
         }
     }
 
+    @Override
+    public List<SysUserRole> selectUserRoleList(Long roleId) {
+        return sysUserRoleMapper.selectUserRoleList(roleId);
+    }
+
     /**
      * 校验角色是否有数据权限
      *

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

@@ -15,6 +15,13 @@
                             on u.id = sur.user_id and sur.role_id = #{roleId}
     </select>
 
+    <select id="selectUserRoleList" resultMap="SysUserRoleResult">
+        select *
+        from auth_user_role
+        where     role_id = #{roleId}
+
+    </select>
+
 
     <delete id="delete" parameterType="com.glxp.api.req.auth.FilterUserRoleRequest">
         DELETE

src/main/resources/mybatis/mapper/inout/ReceiveDao.xml

@@ -17,7 +17,7 @@
                 AND billType = #{billType}
             </if>
             <if test="corpName != null and corpName != ''">
-                AND ( SELECT NAME FROM auth_warehouse aw2 WHERE aw2.CODE = io.targetInvCode ) = #{corpName}
+                AND ( SELECT code FROM auth_warehouse aw2 WHERE aw2.CODE = io.targetInvCode ) = #{corpName}
             </if>
             <if test="billNo != null and billNo != ''">
                 AND billNo like concat('%', #{billNo}, '%')

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

@@ -6,23 +6,22 @@
     <select id="selectDetailList" resultType="com.glxp.api.res.inv.InvPlaceOrderDetailResponse">
         SELECT
         a1.count,
-        a2.relId,
+        a1.relId,
-        bp.cpmctymc as productName,
+        bp.cpmctymc AS productName,
         bp.ggxh,
-        a2.batchNo,
+        a1.batchNo,
-        a2.serialNo,
+        a1.serialNo,
         bp.measname,
         bp.zczbhhzbapzbh,
         bp.manufactory,
-        asp.name as invSpaceName,
+        asp.NAME AS invSpaceName,
         bp.nameCode,
-        (select name from basic_corp where erpId = a2.supId)         supName
+        ( SELECT NAME FROM basic_corp WHERE erpId = a1.supId ) supName
         FROM
         inv_place_order_detail a1
-        LEFT JOIN inv_prein_product_detail a2 ON a1.CODE = a2.CODE
+        LEFT JOIN basic_udirel bu ON bu.id = a1.relId
-        LEFT JOIN basic_udirel bu ON bu.id = a2.relId
         LEFT JOIN basic_products bp ON bp.uuid = bu.uuid
-        LEFT JOIN auth_space asp on a1.invSpaceCode=asp.`code`
+        LEFT JOIN auth_space asp ON a1.invSpaceCode = asp.`code`
         <where>
             <if test="recordId != null and recordId != ''">
                 AND a1.recordId = #{recordId}

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

@@ -224,8 +224,7 @@
 
     <select id="getInventoryQuantity" resultType="Integer">
 
-        SELECT
+        SELECT ifnull(SUM(inCount),0)-ifnull(SUM(outCount),0)
-            SUM( inCount )- SUM( outCount )
         FROM
             inv_prein_product_detail ipd
         WHERE

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

@@ -224,8 +224,7 @@
 
     <select id="getInventoryQuantity" resultType="Integer">
 
-        SELECT
+        SELECT ifnull(SUM(inCount),0)-ifnull(SUM(outCount),0)
-            SUM( inCount )- SUM( outCount )
         FROM
             inv_pre_product_detail ipd
         WHERE

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

@@ -306,8 +306,7 @@
 
     <select id="getInventoryQuantity" resultType="Integer">
 
-        SELECT
+        SELECT ifnull(SUM(inCount),0)-ifnull(SUM(outCount),0)
-            SUM( inCount )- SUM( outCount )
         FROM
             inv_product_detail ipd
         WHERE

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

@@ -154,6 +154,7 @@
             <if test="endDate != null and endDate !=''">
                 <![CDATA[ and DATE_FORMAT(pur_apply.createTime,'%Y-%m-%d') <= #{endDate}]]>
             </if>
+            and pur_apply.status=3
         </where>
         GROUP BY basic_products.uuid
     </select>

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

@@ -171,6 +171,7 @@
       <if test="endDate != null and endDate !=''">
         <![CDATA[ and DATE_FORMAT(pur_order.createTime,'%Y-%m-%d') <= #{endDate}]]>
       </if>
+      and pur_order.status=3
     </where>
     </select>
 </mapper>

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

@@ -171,6 +171,7 @@
             <if test="endDate != null and endDate !=''">
                 <![CDATA[ and DATE_FORMAT(pur_plan.createTime,'%Y-%m-%d') <= #{endDate}]]>
             </if>
+              and pur_plan.status=3
         </where>
     </select>
 </mapper>

src/main/resources/schemas/schema_v2.1.sql

@@ -337,7 +337,10 @@ CALL Pro_Temp_ColumnWork('thr_bustype_origin', 'id', 'bigint', 2);
 
 CALL Pro_Temp_ColumnWork('auth_user', 'id', 'bigint', 2);
 CALL Pro_Temp_ColumnWork('auth_user_bustype', 'id', 'bigint', 2);
+CALL Pro_Temp_ColumnWork('auth_user_bustype', 'userId', 'bigint', 2);
 CALL Pro_Temp_ColumnWork('auth_dept', 'id', 'bigint', 2);
+CALL Pro_Temp_ColumnWork('auth_dept', 'pid', 'bigint', 2);
+
 CALL Pro_Temp_ColumnWork('auth_warehouse', 'id', 'bigint', 2);
 CALL Pro_Temp_ColumnWork('auth_warehouse_bustype', 'id', 'bigint', 2);
 CALL Pro_Temp_ColumnWork('auth_warehouse_user', 'id', 'bigint', 2);
@@ -417,3 +420,12 @@ CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'spaceOut', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('io_order_detail_code', 'id', 'bigint ', 2);
 CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'id', 'bigint ', 2);
 CALL Pro_Temp_ColumnWork('io_order_invoice', 'bizIdFk', 'bigint ', 2);
+
+CALL Pro_Temp_ColumnWork('io_order', 'curSpaceCode', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('io_order', 'preCurSpaceCode', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('io_code_temp', 'preSpaceCode', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('io_code_temp', 'preInSpaceCode', 'varchar(255)', 1);
+
+CALL Pro_Temp_ColumnWork('io_code', 'preSpaceCode', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('io_code', 'preInSpaceCode', 'varchar(255)', 1);
+