fix:更新生产订单详情信息表

zkqy-admin/src/main/resources/application-druid.yml

@@ -6,13 +6,13 @@ spring:
         druid:
             # 主库数据源 http:///
             master:
-                url: jdbc:mysql://localhost:3306/ry-vue-call?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
+                url: jdbc:mysql://192.168.2.135:3307/ry-vue-call?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
                 #url: jdbc:mysql://192.168.110.15:3306/ry-vue-call?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
                 #url: jdbc:mysql://121.37.234.37:3306/zkqyzk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
                 username: root
                 #password: zkqy8888
-                password: root
-#                password: quanyi666
+#                password: root
+                password: quanyi666
 #                password: zkqy123456,
                 #password: zkqy@8888888
             # 从库数据源

zkqy-admin/src/main/resources/application.yml

@@ -201,12 +201,12 @@ projectDownloadZip:
 OpenAuthorization2:
   MES:
     # 单点获取code、token、userinfo主机地址
-    URL: http://192.168.1.249:8066/oauth2
+    URL: http://192.168.2.190:8066/oauth2
     # 系统标识
     BASIC: mes
     # 重定向本系统主机地址
-    REDIRECT_URL: http://192.168.1.249:1025
+    REDIRECT_URL: http://192.168.2.190:1025
     # 回调地址
-    CALLBACK: http://192.168.1.249:8066/oauth/callback
+    CALLBACK: http://192.168.2.190:8066/oauth/callback
     #
     NAME: hmc

zkqy-framework/src/main/java/com/zkqy/framework/sso_oauth2/controller/ThirdPartLoginController.java

@@ -7,6 +7,7 @@ import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.core.domain.entity.SysUser;
 import com.zkqy.common.utils.StringUtils;
 import com.zkqy.common.utils.http.HttpUtilsOauth2;
+import com.zkqy.framework.web.service.SysLoginService;
 import com.zkqy.system.service.ISysUserService;
 import org.apache.http.HttpResponse;
 import org.apache.http.util.EntityUtils;
@@ -49,6 +50,9 @@ public class ThirdPartLoginController {
     @Value("${OpenAuthorization2.MES.NAME}")
     private String name;
 
+    @Autowired
+    private SysLoginService loginService;
+
     @GetMapping("oauth/callback")
     public String callback(@RequestParam("code") String code, HttpSession session, HttpServletRequest request) {
         try {
@@ -65,6 +69,7 @@ public class ThirdPartLoginController {
                 map.put("client_id","mestools");
             }
             map.put("client_secret", "zkqy8888");
+
             // 获取token请求头
             Map<String, String> headers = new HashMap<>();
             // 转换编码凭证
@@ -95,6 +100,11 @@ public class ThirdPartLoginController {
                     JSONObject jsonObject = JSONObject.parseObject(retUserMap.get("user_info").toString());
                     SysUser sysUser = JSON.toJavaObject(jsonObject, SysUser.class);
                     if (null != sysUser) {
+                        //检查租户过期时间
+                        String checkTenantExpirationTimeMsg = loginService.checkTenantExpirationTime(sysUser.getTenant().getTenantId() + "¥¥¥" + sysUser.getUserName());
+                        if (!checkTenantExpirationTimeMsg.isEmpty()) {
+                            return "redirect:" + REDIRECT_URL + "/401";
+                        }
                         System.out.println("用户名：" + (sysUser.getTenant().getTenantCode() + "^_^" + sysUser.getUserName() + "^_^" + System.currentTimeMillis() / 1000));
                         byte[] userInfo = Base64.getEncoder().encode((sysUser.getTenant().getTenantCode() + "^_^" + sysUser.getUserName() + "^_^" + System.currentTimeMillis() / 1000).getBytes(StandardCharsets.UTF_8));
                         String retUserInfo = new String(userInfo, StandardCharsets.UTF_8);
@@ -147,6 +157,7 @@ public class ThirdPartLoginController {
             // 授权失败处理
             return "redirect:" + REDIRECT_URL + "/401";
         }
+
         //
         //处理租户拼接问题(buffer线程安全)
         StringBuffer tenantIdStringBuffer=new StringBuffer("213");
@@ -184,6 +195,10 @@ public class ThirdPartLoginController {
             // 授权失败处理
             return "redirect:" + REDIRECT_URL + "/401";
         }
+        String checkTenantExpirationTimeMsg = loginService.checkTenantExpirationTime(tenantId + "¥¥¥" + userName);
+        if (!checkTenantExpirationTimeMsg.isEmpty()) {
+            return "redirect:" + REDIRECT_URL + "/401";
+        }
         //处理租户拼接问题(buffer线程安全)
         StringBuffer tenantIdStringBuffer=new StringBuffer(tenantId);
         tenantIdStringBuffer.append("¥¥¥");

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/AutomaticSchedulingOnSiteController.java

@@ -38,7 +38,7 @@ public class AutomaticSchedulingOnSiteController extends BaseController
     /**
      * 查询场内计划排产信息列表
      */
-    @PreAuthorize("@ss.hasPermi('automaticSchedulingOnSite:site:list')")
+//    @PreAuthorize("@ss.hasPermi('automaticSchedulingOnSite:site:list')")
     @GetMapping("/list")
     public TableDataInfo list(AutomaticSchedulingOnSite automaticSchedulingOnSite)
     {

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/ProcedureListController.java

@@ -39,7 +39,7 @@ public class ProcedureListController extends BaseController
     /**
      * 查询工序列表列表
      */
-    @PreAuthorize("@ss.hasPermi('procedureList:list:list')")
+//    @PreAuthorize("@ss.hasPermi('procedureList:list:list')")
     @GetMapping("/list")
     public TableDataInfo list(ProcedureList procedureList)
     {
@@ -51,7 +51,7 @@ public class ProcedureListController extends BaseController
     /**
      * 导出工序列表列表
      */
-    @PreAuthorize("@ss.hasPermi('procedureList:list:export')")
+//    @PreAuthorize("@ss.hasPermi('procedureList:list:export')")
     @Log(title = "工序列表", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, ProcedureList procedureList)
@@ -64,7 +64,7 @@ public class ProcedureListController extends BaseController
     /**
      * 获取工序列表详细信息
      */
-    @PreAuthorize("@ss.hasPermi('procedureList:list:query')")
+//    @PreAuthorize("@ss.hasPermi('procedureList:list:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/ProcedureListErpController.java

@@ -39,7 +39,7 @@ public class ProcedureListErpController extends BaseController
     /**
      * 查询erp工序列表列表
      */
-    @PreAuthorize("@ss.hasPermi('erpProcessList:erp工序列表:list')")
+//    @PreAuthorize("@ss.hasPermi('erpProcessList:erp工序列表:list')")
     @GetMapping("/list")
     public TableDataInfo list(ProcedureListErp procedureListErp)
     {
@@ -51,7 +51,7 @@ public class ProcedureListErpController extends BaseController
     /**
      * 导出erp工序列表列表
      */
-    @PreAuthorize("@ss.hasPermi('erpProcessList:erp工序列表:export')")
+//    @PreAuthorize("@ss.hasPermi('erpProcessList:erp工序列表:export')")
     @Log(title = "erp工序列表", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, ProcedureListErp procedureListErp)
@@ -64,7 +64,7 @@ public class ProcedureListErpController extends BaseController
     /**
      * 获取erp工序列表详细信息
      */
-    @PreAuthorize("@ss.hasPermi('erpProcessList:erp工序列表:query')")
+//    @PreAuthorize("@ss.hasPermi('erpProcessList:erp工序列表:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -74,7 +74,7 @@ public class ProcedureListErpController extends BaseController
     /**
      * 新增erp工序列表
      */
-    @PreAuthorize("@ss.hasPermi('erpProcessList:erp工序列表:add')")
+//    @PreAuthorize("@ss.hasPermi('erpProcessList:erp工序列表:add')")
     @Log(title = "erp工序列表", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ProcedureListErp procedureListErp)
@@ -85,7 +85,7 @@ public class ProcedureListErpController extends BaseController
     /**
      * 修改erp工序列表
      */
-    @PreAuthorize("@ss.hasPermi('erpProcessList:erp工序列表:edit')")
+//    @PreAuthorize("@ss.hasPermi('erpProcessList:erp工序列表:edit')")
     @Log(title = "erp工序列表", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody ProcedureListErp procedureListErp)
@@ -96,7 +96,7 @@ public class ProcedureListErpController extends BaseController
     /**
      * 删除erp工序列表
      */
-    @PreAuthorize("@ss.hasPermi('erpProcessList:erp工序列表:remove')")
+//    @PreAuthorize("@ss.hasPermi('erpProcessList:erp工序列表:remove')")
     @Log(title = "erp工序列表", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/RingScanInformationController.java

@@ -9,13 +9,16 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.zkqy.amichi.domain.GenerateEmployeeVo;
 import com.zkqy.amichi.domain.RingScanInformationFirst;
+import com.zkqy.amichi.domain.StationInformation;
 import com.zkqy.amichi.domain.vo.RingScanInformationLogVo;
 import com.zkqy.amichi.domain.vo.RingScanInformationQueryVo;
 import com.zkqy.amichi.domain.vo.RingScanInformationVo;
 import com.zkqy.amichi.domain.vo.ScanStatistics;
 import com.zkqy.amichi.mapper.RingScanInformationFirstMapper;
 import com.zkqy.amichi.mapper.RingScanInformationMapper;
+import com.zkqy.amichi.mapper.StationInformationMapper;
 import com.zkqy.amichi.service.IRingScanInformationService;
 import com.zkqy.amichi.utils.MaUtils;
 import com.zkqy.common.annotation.Anonymous;
@@ -24,11 +27,13 @@ import com.zkqy.common.constant.HttpStatus;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.core.domain.R;
+import com.zkqy.common.core.domain.entity.SysUser;
 import com.zkqy.common.core.page.TableDataInfo;
 import com.zkqy.common.enums.BusinessType;
 import com.zkqy.common.utils.PageUtils;
 import com.zkqy.common.utils.StringUtils;
 import com.zkqy.common.utils.poi.ExcelUtil;
+import com.zkqy.system.mapper.SysUserMapper;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -54,7 +59,7 @@ public class RingScanInformationController extends BaseController
     /**
      * 查询指环王扫描日志信息列表
      */
-    @PreAuthorize("@ss.hasPermi('ringScanInformation:information:list')")
+//    @PreAuthorize("@ss.hasPermi('ringScanInformation:information:list')")
     @Anonymous
     @GetMapping("/list")
     public TableDataInfo list(RingScanInformation ringScanInformation)
@@ -142,13 +147,16 @@ public class RingScanInformationController extends BaseController
     {
         //用户名，工位，生产订单总数，成功数量，失败数量，订单号
         List<Map> list = ringScanInformationService.handHeldJournal(ringScanInformation);
+        //
         List<Map> list1=new ArrayList<>();
         list.forEach(item->{
+            String s = ringScanInformationService.selectRingScanInfoByUserNameAndOrderNumber(item.get("uname").toString(),
+                    item.get("dordername").toString(), item.get("processName").toString());//查询这个人
             HashMap hashMap=new HashMap();
             hashMap.put("Uname",item.get("uname"));
             hashMap.put("Ugw",item.get("ugw"));
             hashMap.put("Dcount",item.get("dcount"));
-            hashMap.put("Dscount",item.get("dsCount"));
+            hashMap.put("Dscount",s);
             hashMap.put("Dfcount",item.get("dfCount"));
             hashMap.put("Dorder",item.get("dorder"));
             list1.add(hashMap);
@@ -172,6 +180,31 @@ public class RingScanInformationController extends BaseController
         prefixString.append(s);
         return AjaxResult.success("员工码创建成功",prefixString);
     }
+    @Autowired
+    SysUserMapper sysUserMapper;
+
+    @Autowired
+    StationInformationMapper stationInformationMapper;
+    @Anonymous
+    @GetMapping("/generate/generateEmployeeCodeList")
+    public TableDataInfo generateEmployeeCode(GenerateEmployeeVo generateEmployeeVo)
+    {
+          //所有系統系統
+        StringBuilder builder=new StringBuilder();
+        startPage();
+//        List<SysUser> sysUsers = sysUserMapper.selectUserListFjqy(generateEmployeeVo.getUserIds());
+        List<StationInformation> stationInformations = stationInformationMapper.selectStationInformationListInUserId(generateEmployeeVo.getUserIds());
+//        List<GenerateEmployeeVo> list1=new ArrayList<>();
+        //循环
+        stationInformations.forEach(item->{
+            builder.append(item.getPersonnelId().toString()).append("#").append(item.getPersonnelName()).append("scan@");
+            String s = MaUtils.generateQRCodeConfig(builder.toString(), 400, 400);
+            StringBuilder prefixString=new StringBuilder("data:image/png;base64,");
+            prefixString.append(s);
+            item.setImages(prefixString.toString());
+        });
+        return getDataTable(stationInformations);
+    }
 
 
     /**

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/StationInformationController.java

@@ -49,7 +49,7 @@ public class StationInformationController extends BaseController
     /**
      * 导出工位信息列表
      */
-    @PreAuthorize("@ss.hasPermi('amichi:stationInformation:export')")
+//    @PreAuthorize("@ss.hasPermi('amichi:stationInformation:export')")
     @Log(title = "工位信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ApiOperation(value = "导出工位信息列表")
@@ -125,7 +125,7 @@ public class StationInformationController extends BaseController
     /**
      * 获取工位信息详细信息
      */
-    @PreAuthorize("@ss.hasPermi('amichi:stationInformation:query')")
+//    @PreAuthorize("@ss.hasPermi('amichi:stationInformation:query')")
     @GetMapping(value = "/{id}")
     @ApiOperation(value = "获取工位信息详细信息")
     public AjaxResult getInfo(@PathVariable("id") Long id)
@@ -136,7 +136,7 @@ public class StationInformationController extends BaseController
     /**
      * 新增工位信息
      */
-    @PreAuthorize("@ss.hasPermi('amichi:stationInformation:add')")
+//    @PreAuthorize("@ss.hasPermi('amichi:stationInformation:add')")
     @Log(title = "工位信息", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation(value = "新增工位信息")
@@ -148,7 +148,7 @@ public class StationInformationController extends BaseController
     /**
      * 修改工位信息
      */
-    @PreAuthorize("@ss.hasPermi('amichi:stationInformation:edit')")
+//    @PreAuthorize("@ss.hasPermi('amichi:stationInformation:edit')")
     @Log(title = "工位信息", businessType = BusinessType.UPDATE)
     @PutMapping
     @ApiOperation(value = "修改工位信息")
@@ -160,7 +160,7 @@ public class StationInformationController extends BaseController
     /**
      * 删除工位信息
      */
-    @PreAuthorize("@ss.hasPermi('amichi:stationInformation:remove')")
+//    @PreAuthorize("@ss.hasPermi('amichi:stationInformation:remove')")
     @Log(title = "工位信息", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     @ApiOperation(value = "删除工位信息")

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/domain/GenerateEmployeeVo.java

@@ -0,0 +1,46 @@
+package com.zkqy.amichi.domain;
+
+import java.util.List;
+
+public class GenerateEmployeeVo {
+    List<String>  userIds;
+
+    private  String  images;
+
+    private  String  userId;
+
+    private  String userName;
+
+
+    public List<String> getUserIds() {
+        return userIds;
+    }
+
+    public void setUserIds(List<String> userIds) {
+        this.userIds = userIds;
+    }
+
+    public String getImages() {
+        return images;
+    }
+
+    public void setImages(String images) {
+        this.images = images;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+}

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/domain/RingScanInformation.java

@@ -30,17 +30,9 @@ public class RingScanInformation extends BaseEntity
     private String personnelName;
 
 
-    @Excel(name = "人员姓名")
+    @Excel(name = "完成数量")
     private String overNumber;
 
-    public String getOverNumber() {
-        return overNumber;
-    }
-
-    public void setOverNumber(String overNumber) {
-        this.overNumber = overNumber;
-    }
-
     /** 设备编号 */
 //    @Excel(name = "设备编号")
     private String deviceNumber;
@@ -99,6 +91,26 @@ public class RingScanInformation extends BaseEntity
     @Excel(name = "扫描信息")
     private String executionMessage;
 
+
+
+    /** 分页sql用到了*/
+    private  Integer offset;
+
+    /** 当前页*/
+    private int pageNum;
+
+    /** 每页显示多少条*/
+    private  int pageSize;
+
+    public String getOverNumber() {
+        return overNumber;
+    }
+
+    public void setOverNumber(String overNumber) {
+        this.overNumber = overNumber;
+    }
+
+
     public String getExecutionMark() {
         return executionMark;
     }
@@ -115,14 +127,6 @@ public class RingScanInformation extends BaseEntity
         this.executionMessage = executionMessage;
     }
 
-    /** 分页sql用到了*/
-    private  Integer offset;
-
-    /** 当前页*/
-    private int pageNum;
-
-    /** 每页显示多少条*/
-    private  int pageSize;
 
 
     public int getPageNum() {

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/domain/StationInformation.java

@@ -18,6 +18,16 @@ public class StationInformation extends BaseEntity
     /** 主键 */
     private Long id;
 
+    private String images;
+
+    public String getImages() {
+        return images;
+    }
+
+    public void setImages(String images) {
+        this.images = images;
+    }
+
     /** 工位码信息 */
     @Excel(name = "工位码信息")
     private String stationCode;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/RingScanInformationMapper.java

@@ -8,6 +8,7 @@ import com.zkqy.amichi.domain.vo.RingScanInformationLogVo;
 import com.zkqy.amichi.domain.vo.RingScanInformationVo;
 import com.zkqy.amichi.domain.vo.ScanStatistics;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 指环王扫描日志信息Mapper接口
@@ -138,4 +139,15 @@ public interface RingScanInformationMapper
      * @return
      */
     List<RingScanInformation> selectRingScanInformationListisNotNull(RingScanInformation prodOrderScanning);
+
+    /**
+     * 查询
+     * @param uname
+     * @param dorder
+     * @param gw
+     * @return
+     */
+    String selectRingScanInfoByUserNameAndOrderNumber(@Param("uname") String uname,
+                                                      @Param("dorder")String dorder,
+                                                      @Param("gw")String gw);
 }

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/StationInformationMapper.java

@@ -99,4 +99,11 @@ public interface StationInformationMapper
      * @return
      */
     List<StationInformation> selectStationInformationListByDEviceNumber(StationInformation stationInformation);
+
+    /**
+     * 根据用户id查询
+     * @param userIds
+     * @return
+     */
+    List<StationInformation> selectStationInformationListInUserId(List<String> userIds);
 }

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/IRingScanInformationService.java

@@ -114,4 +114,12 @@ public interface IRingScanInformationService
      * @return
      */
     List<Map> handHeldJournal(RingScanInformation ringScanInformation);
+
+    /**
+     *
+     * @param uname
+     * @param dorder
+     * @return
+     */
+    String selectRingScanInfoByUserNameAndOrderNumber(String uname, String dorder,String gw);
 }

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/impl/RingScanInformationServiceImpl.java

@@ -150,4 +150,9 @@ public class RingScanInformationServiceImpl implements IRingScanInformationServi
         return ringScanInformationMapper.handHeldJournal(ringScanInformation);
     }
 
+    @Override
+    public String selectRingScanInfoByUserNameAndOrderNumber(String uname, String dorder, String gw) {
+        return ringScanInformationMapper.selectRingScanInfoByUserNameAndOrderNumber(uname,dorder, gw);
+    }
+
 }

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/impl/StationInformationServiceImpl.java

@@ -233,6 +233,9 @@ public class StationInformationServiceImpl implements IStationInformationService
             StationInformation stationInformation2 = new StationInformation();
             stationInformation2.setPersonnelId(personneList[0]);//设备编号
             List<StationInformation> stationInformations1 = stationInformationMapper.selectStationInformationList(stationInformation2);
+            if(stationInformations1.size()<=0){
+                return "当前工序没有此-人员-扫描失败-0-0-0-0";
+            }
             System.out.println("工位:"+stationInformations1.get(0).getStationName()+"人员:"+stationInformations1.get(0).getPersonnelName());
             return stationInformations1.get(0).getStationName()+"-"+stationInformations1.get(0).getPersonnelName()+"-手持设备绑定成功";
         }else {
@@ -331,7 +334,7 @@ public class StationInformationServiceImpl implements IStationInformationService
             if(ringScanInformations.size()>0){
                 ringScanInformation.setExecutionMark("2");//成功
                 ringScanInformation.setExecutionMessage("重复扫描");
-                ringScanInformation.setOverNumber("0");
+                ringScanInformation.setOverNumber(ringScanInformations.get(0).getOverNumber());
                 int i2 = ringScanInformationMapper.insertRingScanInformation(ringScanInformation);
                 //查询订单号，订单总数量 完成数量，失败数量
                 //查询当前工位信息
@@ -488,6 +491,7 @@ public class StationInformationServiceImpl implements IStationInformationService
                     RingScanInformation ringScanInformation1=new RingScanInformation();
                     ringScanInformation1.setProductionOrderNumber(ringScanInformation.getProductionOrderNumber());
                     ringScanInformation1.setProcessName("焊接D");
+                    ringScanInformation1.setOrderNumber(ringScanInformation.getOrderNumber());
                     String s = ringScanInformationMapper.selectRingScanInformationListLike(ringScanInformation1);
                     int i = Integer.parseInt(s);
                     int ss=i+1;
@@ -496,6 +500,7 @@ public class StationInformationServiceImpl implements IStationInformationService
                     RingScanInformation ringScanInformation1=new RingScanInformation();
                     ringScanInformation1.setProductionOrderNumber(ringScanInformation.getProductionOrderNumber());
                     ringScanInformation1.setProcessName("焊接Z");
+                    ringScanInformation1.setOrderNumber(ringScanInformation.getOrderNumber());
                     String s = ringScanInformationMapper.selectRingScanInformationListLike(ringScanInformation1);
                     int i = Integer.parseInt(s);
                     int ss=i+1;
@@ -536,21 +541,17 @@ public class StationInformationServiceImpl implements IStationInformationService
 
             //查询当前工位信息
             ScanStatistics scanStatistics = null;
-            try {
-                RingScanInformation ringScanInformation1=new RingScanInformation();
-                ringScanInformation1.setProductionOrderNumber(ringScanInformation.getProductionOrderNumber());
-                ringScanInformation1.setProcessName(ringScanInformation.getProcessName());
-                if(ringScanInformation.getProcessName().equals("焊接")) {
-                    if (ringScanInformation.getContentInformation().contains("D")) {
-                        ringScanInformation1.setProcessName("焊接D");
-                    } else {
-                        ringScanInformation1.setProcessName("焊接Z");
-                    }
+            RingScanInformation ringScanInformation1=new RingScanInformation();
+            ringScanInformation1.setProductionOrderNumber(ringScanInformation.getProductionOrderNumber());
+            ringScanInformation1.setProcessName(ringScanInformation.getProcessName());
+            if(ringScanInformation.getProcessName().equals("焊接")) {
+                if (ringScanInformation.getContentInformation().contains("D")) {
+                    ringScanInformation1.setProcessName("焊接D");
+                } else {
+                    ringScanInformation1.setProcessName("焊接Z");
                 }
-                scanStatistics = ringScanInformationMapper.selectScanStatistics(ringScanInformation1);
-            } catch (Exception e) {
-                throw new RuntimeException(e);
             }
+            scanStatistics = ringScanInformationMapper.selectScanStatistics(ringScanInformation1);
             //记录扫迈欧
             return ringScanInformation.getStationName()+"-"+ringScanInformation.getPersonnelName()+"-"+"扫描成功"+"-"+
                     scanStatistics.getdOrder()+"-"+scanStatistics.getdCount()+"-"+scanStatistics.getDsCount()+"-"+scanStatistics.getDfCount();

zkqy-fujian-amichi/src/main/resources/mapper/RingScanInformationMapper.xml

@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <sql id="selectRingScanInformationVo">
-        select id, device_number, device_name, scanning_time,process_name,station_name, content_information,personnel_name,order_number,production_order_number,execution_message from fjqydb.ring_scan_information
+        select id, device_number, device_name, scanning_time,process_name,station_name, content_information,personnel_name,order_number,production_order_number,execution_message,over_number from fjqydb.ring_scan_information
     </sql>
 
     <select id="selectRingScanInformationList" parameterType="com.zkqy.amichi.domain.RingScanInformation" resultMap="RingScanInformationResult">
@@ -103,7 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <![CDATA[ and scanning_time <= #{scanningTimes[0]}]]>
             </if>
         </where>
-        order by  scanning_time,process_name
+        order by  personnel_name,process_name asc,scanning_time desc
     </select>
 
 
@@ -288,20 +288,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectScanStatistics" resultType="com.zkqy.amichi.domain.vo.ScanStatistics" parameterType="com.zkqy.amichi.domain.RingScanInformation">
         SELECT
-        c.production_order_number as dOrder,
+        CONCAT(c.order_number, '/', c.model_number) AS dOrder,
         c.dCount,
         SUM( CASE WHEN c.execution_mark = 1 THEN 1 ELSE 0 END ) AS dsCount,
         SUM( CASE WHEN c.execution_mark = 2 THEN 1 ELSE 0 END ) As  dfCount
         FROM
         (
             SELECT
-            rsi.production_order_number,
+            rsi.order_number,
             rsi.native_numbering,
-            rsif.production_order_total_quantity AS dCount,
-            rsi.execution_mark
+            rsif.total_quantity AS dCount,
+            rsi.execution_mark,
+            ptd.model_number
         FROM
         fjqydb.ring_scan_information rsi
         LEFT JOIN fjqydb.ring_scan_information_first rsif ON rsi.production_order_number = rsif.production_order_number
+        LEFT JOIN fjqydb.plan_task_details AS ptd ON rsi.production_order_number = ptd.demand_document
         <where>
             <if test="processName!=null and processName!='' and processName.equals('焊接D')">
                 rsi.content_information LIKE concat('%','D', '%' )  and rsi.process_name='焊接'
@@ -315,11 +317,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="processName!=null and processName!='' and processName!='焊接D' and processName!='焊接Z'">
                 and rsi.process_name like concat('%', #{processName}, '%')
             </if>
+            and execution_mark='1'
         </where>
         GROUP BY native_numbering
         ) AS c
         GROUP BY
-        production_order_number
+        order_number
     </select>
     <select id="selectRingScanInformationListLike" resultType="java.lang.String" parameterType="com.zkqy.amichi.domain.RingScanInformation">
         SELECT
@@ -333,30 +336,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="processName!=null and processName!='' and processName.equals('焊接Z')">
                 content_information LIKE concat('%','Z', '%' )  and process_name='焊接'
             </if>
-            <if test="productionOrderNumber!=null and productionOrderNumber!=''">
-                and production_order_number=#{productionOrderNumber}
+            <if test="orderNumber!=null and orderNumber!=''">
+                and order_number=#{orderNumber}
             </if>
             <if test="processName!=null and processName!='' and processName!='焊接D' and processName!='焊接Z'">
                 and process_name like concat('%', #{processName}, '%')
             </if>
+            and execution_mark='1'
         </where>
     </select>
 
     <select id="handHeldJournal" resultType="map" parameterType="com.zkqy.amichi.domain.RingScanInformation">
         SELECT
-            rsif.production_order_total_quantity as Dcount,
-            rsi.order_number as orderNumber,
-            rsi.production_order_number as Dorder,
+            rsif.total_quantity as Dcount,
+            concat(rsi.order_number,'/' ,ptd.model_number) as Dorder,
+            rsi.order_number as DorderName,
+            rsi.production_order_number ,
             rsi.personnel_name as Uname,
             rsi.station_name as Ugw,
+            rsi.process_name as processName,
             SUM( CASE WHEN rsi.execution_mark = 1 THEN 1 ELSE 0 END ) AS dsCount,
             SUM( CASE WHEN rsi.execution_mark = 2 THEN 1 ELSE 0 END ) As  dfCount
         FROM
             fjqydb.ring_scan_information AS rsi
                 LEFT JOIN fjqydb.ring_scan_information_first AS rsif ON rsi.production_order_number = rsif.production_order_number
+                left join fjqydb.plan_task_details as ptd on rsi.production_order_number=ptd.demand_document
         where DATE(rsi.scanning_time) = CURDATE()
         GROUP BY
-            rsi.production_order_number,
+            rsi.order_number,
             rsi.personnel_name,
             rsi.station_name
     </select>
@@ -383,6 +390,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by  scanning_time,process_name
     </select>
+    <select id="selectRingScanInfoByUserNameAndOrderNumber" resultType="java.lang.String">
+        SELECT
+            COUNT(DISTINCT rsi.native_numbering) AS completedMachines
+        FROM
+            fjqydb.ring_scan_information AS rsi
+        WHERE
+            rsi.process_name = #{gw}
+          AND rsi.personnel_name = #{uname}
+          AND rsi.order_number =#{dorder}
+          AND rsi.execution_mark = '1'
+        GROUP BY
+            rsi.personnel_name,
+            rsi.order_number;
+    </select>
 
 
     <insert id="insertRingScanInformation" parameterType="com.zkqy.amichi.domain.RingScanInformation" useGeneratedKeys="true" keyProperty="id">

zkqy-fujian-amichi/src/main/resources/mapper/StationInformationMapper.xml

@@ -105,6 +105,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectStationInformationVo"/>
         where device_number = #{deviceNumber}
     </select>
+    <select id="selectStationInformationListInUserId" resultType="com.zkqy.amichi.domain.StationInformation">
+        select id, station_code, station_name, personnel_id, personnel_name, device_id, device_name, remark, create_by_id, create_by,
+               create_time, update_by_id, update_by, update_time, del_flag, data_approval_status, process_key, task_process_key, task_node_key,team_name,
+               team_code,station_type,device_number,bluetooth_name,process_id,process_name
+        from fjqydb.station_information
+        where `personnel_id` in
+        <foreach item="id" collection="list" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
 
     <insert id="insertStationInformation" parameterType="com.zkqy.amichi.domain.StationInformation" useGeneratedKeys="true" keyProperty="id">
         insert into {DBNAME}.station_information

zkqy-system/src/main/java/com/zkqy/system/mapper/SysUserMapper.java

@@ -184,4 +184,11 @@ public interface SysUserMapper {
      * @return 用户对象信息
      */
     public SysUser selectUserInfoByTenantCode(@Param("tenantCode") String tenantCode, @Param("userName") String userName);
+
+    /**
+     * 查詢所有用戶信息
+     * @param userIds
+     * @return
+     */
+    List<SysUser> selectUserListFjqy(List<String> userIds);
 }

zkqy-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -363,5 +363,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<include refid="selectUserVo"/>
 		where te.tenant_code = #{tenantCode} and u.user_name = #{userName} and u.del_flag = '0'
 	</select>
+    <select id="selectUserListFjqy"  resultType="com.zkqy.common.core.domain.entity.SysUser">
+		select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+		from sys_user as u
+		where u.tenant_id ='216' and u.user_id  in
+		<foreach collection="list" item="userId" open="(" close=")" separator=",">
+			#{userId}
+		</foreach>
+	</select>
 
 </mapper> 

zkqy-ui/.env.development

@@ -9,7 +9,7 @@ VUE_APP_BASE_API = '/dev-api'
 
 # 图片路径
 #VUE_APP_BASE_IMG_API = 'http://192.168.2.127:1024/dev-api'
-VUE_APP_BASE_IMG_API = 'http://192.168.1.249:1025/dev-api'
+VUE_APP_BASE_IMG_API = 'http://192.168.2.190:1025/dev-api'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
@@ -19,7 +19,7 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
 # VUE_APP_BASE_API1 = 'http://192.168.110.120:8066/'
 # VUE_APP_BASE_API1 = 'http://192.168.110.76:8066/'
 #VUE_APP_BASE_API1 = 'http://192.168.2.127:8066/'
-VUE_APP_BASE_API1 = 'http://192.168.1.249:8066/'
+VUE_APP_BASE_API1 = 'http://192.168.2.190:8066/'
 
 # ws地址
 VUE_APP_BASE_WS_API = '//127.0.0.1:8721'

zkqy-ui/src/api/amichi/planTask/planTaskDetails.js

@@ -25,6 +25,15 @@ export function flowCardList(data) {
   })
 }
 
+export function generateEmployeeCodeList(data) {
+  return request({
+    url: '/amichi/ringScanInformation/generate/generateEmployeeCodeList',
+    method: 'get',
+    params: data
+  })
+}
+
+
 export function flowWeldCardListApi(data) {
   return request({
     url: '/planTaskDetails/Details/flowWeldCardList',

zkqy-ui/src/router/index.js

@@ -80,6 +80,20 @@ export const constantRoutes = [
     },
     hidden: true
   },
+  {
+    path: '/amichi/print/ygmPrint',
+    component: () => {
+      return import('@/views/amichi/print/ygmPrint.vue')
+    },
+    hidden: true
+  },
+  {
+    path: '/amichi/print/rkadyPrint',
+    component: () => {
+      return import('@/views/amichi/print/rkadyPrint.vue')
+    },
+    hidden: true
+  },
   {
     path: '/procedureList/erplist/index',
     component: () => {

zkqy-ui/src/views/amichi/MaterialRetentionLog/index.vue

@@ -120,6 +120,7 @@
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
+      :page-sizes="[50]"
     />
 
     <!-- 添加或修改扫码扣料日志对话框 -->
@@ -223,7 +224,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 50,
         materialCode: null,
         materialName: null,
         specification: null,

zkqy-ui/src/views/amichi/dialogCompments/customizedVersion/processDisplay.vue

@@ -46,6 +46,7 @@
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
           @pagination="getList"
+          :page-sizes="[50]"
         />
       </div>
     </div>
@@ -66,7 +67,7 @@ export default {
       total: 0,
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 50,
         status: "1",
       },
       tableData: {}, //列表数据

zkqy-ui/src/views/amichi/dialogCompments/customizedVersion/processDisplay2.vue

@@ -46,6 +46,7 @@
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
           @pagination="getList"
+          :page-sizes="[50]"
         />
       </div>
     </div>
@@ -66,7 +67,7 @@ export default {
       total: 0,
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 50,
         status: "1",
       },
       tableData: {}, //列表数据

zkqy-ui/src/views/amichi/planTask/salesPlan.vue

@@ -58,65 +58,74 @@
 
       <div class="mb8 btn-wrap">
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
+<!--          <el-col :span="1.5">-->
+<!--            <el-button-->
+<!--              type="primary"-->
+<!--              plain-->
+<!--              icon="el-icon-plus"-->
+<!--              size="mini"-->
+<!--              @click="handleAdd"-->
+<!--              v-hasPermi="['amichi:tasks:add']"-->
+<!--            >新增</el-button>-->
+<!--          </el-col>-->
+<!--          <el-col :span="1.5">-->
+<!--            <el-button-->
+<!--              type="success"-->
+<!--              plain-->
+<!--              icon="el-icon-edit"-->
+<!--              size="mini"-->
+<!--              :disabled="single"-->
+<!--              @click="handleUpdate"-->
+<!--              v-hasPermi="['amichi:tasks:edit']"-->
+<!--            >修改</el-button>-->
+<!--          </el-col>-->
+<!--          <el-col :span="1.5">-->
+<!--            <el-button-->
+<!--              type="danger"-->
+<!--              plain-->
+<!--              icon="el-icon-delete"-->
+<!--              size="mini"-->
+<!--              :disabled="multiple"-->
+<!--              @click="handleDelete"-->
+<!--              v-hasPermi="['amichi:tasks:remove']"-->
+<!--            >删除</el-button>-->
+<!--          </el-col>-->
+<!--          <el-col :span="1.5">-->
+<!--            <el-button-->
+<!--              type="warning"-->
+<!--              plain-->
+<!--              icon="el-icon-download"-->
+<!--              size="mini"-->
+<!--              @click="handleExport"-->
+<!--              v-hasPermi="['amichi:tasks:export']"-->
+<!--            >导出</el-button>-->
+<!--          </el-col>-->
+<!--          <el-col :span="1.5">-->
+<!--            <el-button-->
+<!--              :disabled="!selection.length"-->
+<!--              type="info"-->
+<!--              icon="el-icon-s-help"-->
+<!--              size="mini"-->
+<!--              @click="handleAuto"-->
+<!--            >自动排产</el-button>-->
+<!--          </el-col>-->
+          <el-col :span="1.5" v-show="queryParams.tabPosition==1">
             <el-button
               type="primary"
               plain
               icon="el-icon-plus"
               size="mini"
-              @click="handleAdd"
-              v-hasPermi="['amichi:tasks:add']"
-            >新增</el-button>
+              @click="pullPlan"
+            >拉取流转卡生产计划</el-button>
           </el-col>
-          <el-col :span="1.5">
+          <el-col :span="1.5" v-show="queryParams.tabPosition==1">
             <el-button
               type="success"
               plain
               icon="el-icon-edit"
               size="mini"
-              :disabled="single"
-              @click="handleUpdate"
-              v-hasPermi="['amichi:tasks:edit']"
-            >修改</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="danger"
-              plain
-              icon="el-icon-delete"
-              size="mini"
-              :disabled="multiple"
-              @click="handleDelete"
-              v-hasPermi="['amichi:tasks:remove']"
-            >删除</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="warning"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              @click="handleExport"
-              v-hasPermi="['amichi:tasks:export']"
-            >导出</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              :disabled="!selection.length"
-              type="info"
-              icon="el-icon-s-help"
-              size="mini"
-              @click="handleAuto"
-            >自动排产</el-button>
-          </el-col>
-          <el-col :span="1.5" v-show="queryParams.tabPosition==1">
-            <el-button
-              type="primary"
-              plain
-              icon="el-icon-plus"
-              size="mini"
-              @click="pullPlan"
-            >拉取流转卡生产计划</el-button>
+              @click="dylzkdb"
+            >打印流转卡</el-button>
           </el-col>
           <el-col :span="1.5" v-show="queryParams.tabPosition==1">
             <el-button
@@ -124,8 +133,8 @@
               plain
               icon="el-icon-edit"
               size="mini"
-              @click="dylzkdb"
-            >打印流转卡</el-button>
+              @click="rkkdy"
+            >入库卡打印</el-button>
           </el-col>
           <el-col :span="1.5" v-show="queryParams.tabPosition==2">
             <el-button
@@ -557,6 +566,7 @@
           :page.sync="flowCardQueryParams.pageNum"
           :limit.sync="flowCardQueryParams.pageSize"
           @pagination="getListFlowCard"
+          :page-sizes="[50]"
         />
       </el-dialog>
     </div>
@@ -584,7 +594,7 @@ export default {
       flowCardQueryParams:{
         documentNumber:"",
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 50,
       },
       flowCardOpen:false,
       bomFormTableData: [],
@@ -647,7 +657,7 @@ export default {
       },
       qtQueryParams:{
         pageNum: 1, // 第几页
-        pageSize: 10, // 每页大小
+        pageSize: 50, // 每页大小
         ids:[]
       },
       selectIds:[],
@@ -658,7 +668,7 @@ export default {
       // 共通查询参数接受子组件的参数
       queryParams: {
         pageNum: 1, // 第几页
-        pageSize: 10, // 每页大小
+        pageSize: 50, // 每页大小
         orderByColumn: "", // 根据某列排序
         isAsc: "", // desc（降序）或 asc（升序）
         tabPosition:"1"
@@ -694,6 +704,7 @@ export default {
       console.log("打印流转卡")
       if(this.selectIds.length<=0){
         console.log("请先勾选对应数据");
+        this.$message.warn("请先勾选对应数据");
         return;
       }
       console.log(this.selectIds)
@@ -706,6 +717,24 @@ export default {
         }
       });
     },
+    rkkdy(){
+      console.log("rkkdy")
+      console.log("打印流转卡")
+      if(this.selectIds.length<=0){
+        console.log("请先勾选对应数据");
+        this.$message.warning("请先勾选对应数据");
+        return;
+      }
+      console.log(this.selectIds)
+      //完整写法
+      //完整写法
+      this.$router.push({
+        path: '/amichi/print/rkadyPrint',
+        query: {
+          "orderNumberSTwo": this.selectIds,
+        }
+      });
+    },
     formatDateTime(dateTimeString) {
       if (!dateTimeString) return '';
       const date = new Date(dateTimeString);
@@ -728,7 +757,7 @@ export default {
           this.getPlanList(this.queryParams);
           this.loading=false;
         }else {
-          this.$message.success("拉取场内计划失败");
+          this.$message.warning("拉取场内计划失败");
           //查询表格数据
           this.getPlanList(this.queryParams);
           this.loading=false;
@@ -752,6 +781,7 @@ export default {
       console.log(this.queryParams.tabPosition,"dfakljdkjf")
       this.getPlanList();
     },
+
     formatToFixedTwo(value) {
       if (value !== null && value !== undefined) {
         return Number(value).toFixed(2);
@@ -775,7 +805,7 @@ export default {
            this.getPlanList(this.queryParams);
          }else {
            this.loading=false;
-           this.$message.success("拉取场内计划失败");
+           this.$message.warning("拉取场内计划失败");
            //查询表格数据
            this.getPlanList(this.queryParams);
          }

zkqy-ui/src/views/amichi/print/rkadyPrint.vue

@@ -0,0 +1,365 @@
+<template>
+  <div>
+    <div class="tools" style="width: 100%;height:80px;margin: 0 auto">
+      <div style="width:800px;height:80px;display: flex; justify-content: space-between; align-items: center;margin: 0 auto">
+        <div style="width: 800px;height: 40px">
+          <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="flowCardListApi"
+            :page-sizes="[5,10,20]"
+          />
+        </div>
+        <div style="width: 200px;height: 40px">
+          <el-button type="primary" icon="el-icon-search"  size="mini"  v-print="printViewInfo">打印</el-button>
+        </div>
+      </div>
+    </div>
+    <div class="base" id="printView" >
+      <div class="box" style="page-break-after:always;"  v-for="(item,index) in listDate" v-if="index%2==0">
+        <div class="left"  style="margin-top: 15px">
+          <div class="top">
+            <table border="2px" class="left-top-table">
+              <tr>
+                <td rowspan="2" style="width: 30%;">
+                  <div class="titleBox" style="position: relative;">
+                    <div class="erweima" ><img :src="item.base46MaD" alt=""></div>
+                  </div>
+                </td>
+                <td style="width: 30%;">订单号</td>
+                <td style="width: 40%;">{{item.orderNumber}}</td>
+              </tr>
+              <tr>
+                <td style="width: 20%;">产品编号</td>
+                <td style="width: 30%;">{{item.serialNumber}}</td>
+              </tr>
+            </table>
+          </div>
+        </div>
+        <div class="right"  style="margin-left: 15px;margin-top: 15px">
+          <div class="top" v-if="index+1<listDate.length">
+            <table border="2px" class="right-top-table">
+              <tr>
+                <td rowspan="2" style="width: 30%;">
+                  <div class="titleBox" style="position: relative;">
+                    <div class="erweima" ><img :src="item.base46MaD" alt=""></div>
+                  </div>
+                </td>
+                <td style="width: 30%;">订单号</td>
+                <td style="width: 40%;">{{item.orderNumber}}</td>
+              </tr>
+              <tr>
+                <td style="width: 20%;">产品编号</td>
+                <td style="width: 30%;">{{item.serialNumber}}</td>
+              </tr>
+            </table>
+          </div  >
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {flowCardList} from "@/api/amichi/planTask/planTaskDetails.js";
+
+export default {
+  name: "rkadyPrint",
+  data () {
+    return {
+      queryParams:{
+        pageNum: 1,
+        pageSize: 5,
+        orderNumberList:[],
+      },
+      total:0,
+      listDate:[],
+      dialogVisible: false,
+      msg: "打印",
+      printViewInfo: {
+        id: "printView", //打印区域的唯一的id属性
+        // popTitle: '配置页眉标题', // 页眉文字 （不设置时显示undifined）（页眉页脚可以在打印页面的更多设置的选项中取消勾选）
+        // extraHead: '打印，印刷', // 最左上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+        preview: false, // 是否启动预览模式，默认是false （开启预览模式ture会占满整个屏幕，不建议开启，除非业务需要）
+        // previewTitle: '预览的标题', // 打印预览的标题(预览模式preview为true时才显示)
+        // previewPrintBtnLabel: '预览结束，开始打印', // 打印预览的标题下方的按钮文本，点击可进入打印(预览模式preview为true时才显示)
+        zIndex: 20002, // 预览窗口的z-index，默认是20002，最好比默认值更高
+        previewBeforeOpenCallback (that) { console.log('正在加载预览窗口！'); console.log(that.msg, this) }, // 预览窗口打开之前的callback (预览模式preview为true时才执行) （that可以取到data里的变量值）
+        previewOpenCallback () { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback (预览模式preview为true时才执行)
+        beforeOpenCallback () { console.log('开始打印之前！') }, // 开始打印之前的callback
+        openCallback () { console.log('执行打印了！') }, // 调用打印时的callback
+        closeCallback () { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+        clickMounted () { console.log('点击v-print绑定的按钮了！') },
+        // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+        // asyncUrl (reslove) {
+        //   setTimeout(() => {
+        //     reslove('http://localhost:8080/')
+        //   }, 2000)
+        // },
+        standard: '',
+        extarCss: '',
+        isDataLoaded: false,
+      }
+    }
+  },
+  methods: {
+    getNextOrderNumber(index) {
+      if (index < this.listDate.length - 1) {
+        return this.listDate[index + 1];
+      } else {
+        return 0
+      }
+    },
+
+    //渲染表格内容
+    async flowCardListApi(){
+      let res = await flowCardList(this.queryParams)
+      if (res.code == 200) {
+        this.listDate = res.rows;
+        this.total = res.total;
+        this.isDataLoaded = true;
+        this.$nextTick(()=>{
+          this.adjustFontSize();
+          this.adjustFontSizebzxsm()
+        })
+
+      }
+    },
+
+    adjustFontSize() {
+      const element = this.$refs.bzx;
+      if (!element) return; // 如果元素不存在，直接返回
+
+      for (let i=0;i<element.length;i++) {
+        const maxHeight = 115;
+        let currentFontSize = 21;
+        while (element[i].scrollHeight > maxHeight && currentFontSize > 8) {
+          currentFontSize -= 0.5; // 每次减少0.5px
+          element[i].style.fontSize = `${currentFontSize}px`;
+        }
+      }
+      console.log(element[0].style)
+    },
+    adjustFontSizebzxsm() {
+      const element = this.$refs.bzxsm;
+      console.log(element.length)
+      if (!element) return; // 如果元素不存在，直接返回
+      for (let i=0;i<element.length;i++){
+        const maxHeight = 50;
+        let currentFontSize = 21;
+        while (element[i].scrollHeight > maxHeight && currentFontSize > 8) {
+          currentFontSize -= 0.5; // 每次减少0.5px
+          element[i].style.fontSize = `${currentFontSize}px`;
+        }
+      }
+
+      console.log(element[0].style)
+    }
+  },
+  mounted() {
+    // this.adjustFontSize();
+  },
+  created(){
+    // console.log(this.$route.query.orderNumberS)
+    // this.queryParams.orderNumberList =this.$route.query.orderNumberS;
+    this.queryParams.orderNumberList =this.$route.query.orderNumberSTwo;
+    // console.log(this.queryParams.orderNumberList)
+    this.flowCardListApi();
+  },
+}
+
+</script>
+<style media="print" scoped>
+::v-deep .pagination-container {
+  margin-top: -10px;
+}
+
+.bzx{
+  width: 454px;
+  max-height: 115px;
+  overflow: hidden;
+  font-size: 21px;
+}
+.bs{
+  height: 115px;
+  min-height: 115px;
+}
+.bzxsm{
+  width: 180px;
+  max-height: 50px;
+  overflow: hidden;
+  font-size: 21px;
+}
+@media print {
+
+  /* 隐藏页眉页脚 */
+  @page {
+    size: auto;
+    margin: 3mm;
+    .box{
+      margin-top: 10px;
+    }
+  }
+  html {
+    zoom: 90%; /* 缩放比例设置 */
+  }
+  .noprint {
+    display: none; /* 隐藏打印区域不需要打印的内容 */
+  }
+}
+.base{
+  .heg{
+    height: 30px;
+  }
+  .heg td{
+    height: 30px;
+  }
+  .jc{
+    font-weight: bold;
+    font-size: 50px;
+  }
+  .page-break {
+    page-break-after: always;
+    position: relative;
+  }
+  .tools {
+    margin-top: 10px;
+    display: flex;
+    justify-content: flex-end;
+    margin-bottom: 10px;
+  }
+  *{
+    margin: 0 auto;
+    padding: 0;
+  }
+  .box{
+    font-size: 21px;
+    width: 800px;
+    /* border: 1px solid red; */
+    display: flex;
+    justify-content: start;
+    margin-bottom: 10px;
+  }
+  td{
+    text-align: center;
+
+  }
+  .left{
+    width: 48%;
+  }
+  .right{
+    width: 48%;
+  }
+  .left-top-table{
+    width: 100%;
+    border: 2px solid black;
+    border-collapse: collapse;
+    color: black;
+    font-weight: bold;
+  }
+  .left-top-table tr td{
+    padding: 4px 4px;
+    word-wrap:break-word;
+    word-break:break-all;
+    color: black;
+    font-weight: bold;
+  }
+  .right-top-table{
+    width: 100%;
+    border: 1px solid black;
+    border-collapse: collapse;
+    color: black;
+    font-weight: bold;
+    color: black;
+    font-weight: bold;
+  }
+  .right-top-table tr td{
+    padding: 4px 4px;
+    word-wrap:break-word;
+    word-break:break-all;
+    color: black;
+    font-weight: bold;
+  }
+  .erweima{
+    width: 100px;
+    height: 80px;;
+    background-color: red;
+    margin-top: 8px;
+  }
+  .titleBox{
+    display: flex;
+    color: black;
+    width: 100%;
+    height: 120px;
+    font-weight: bold;
+  }
+
+  .left-top-table .titleBox .xh{
+    position: relative;
+  }
+  .left-top-table .titleBox .xh span{
+    position: absolute;
+    width: 80px;
+    left: -421px;
+    top: 80px;
+  }
+  .left-top-table .titleBox .time span{
+    position: absolute;
+    left: 290px;
+    top: 75px;
+  }
+  .right-top-table .titleBox .time span{
+    position: absolute;
+    left: 290px;
+    top: 82px;
+  }
+  .titleBox .time span i{
+    font-style: normal;
+  }
+  .titleBox .title{
+    margin-left: 60px;
+    margin-top: 7px;
+    font-family: 'Courier New', Courier, monospace;
+  }
+  .abc{
+    color: rebeccapurple;
+    font-size: 15px;
+    /* word-wrap: break-word; */
+    /* white-space: pre-wrap; */
+  }
+  .right-top-table .titleBox .xh{
+    position: relative;
+  }
+  .right-top-table .titleBox .xh span{
+    position: absolute;
+    width: 80px;
+    left: -424px;
+    top: 80px;
+  }
+
+  .right-top-table .titleBox .time span{
+    position: absolute;
+    left: 290px;
+    top: 82px;
+  }
+  .right-top-table .titleBox .time span{
+    position: absolute;
+    left: 290px;
+    top: 82px;
+  }
+  .left-top-table td{
+    border: 3px solid black;
+  }
+  .right-top-table td{
+    border: 3px solid black;
+  }
+  .right-top-table td{
+    border: 3px solid black;
+  }
+  .right-top-table td{
+    border: 3px solid black;
+  }
+}
+</style>

zkqy-ui/src/views/amichi/print/ygmPrint.vue

@@ -0,0 +1,239 @@
+<template>
+  <div>
+    <div class="tools" style="width: 100%;height:80px;margin: 0 auto ">
+      <div style="width:800px;height:80px;display: flex; justify-content: space-between; align-items: center;margin: 0 auto">
+        <div style="width: 800px;height: 40px">
+          <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="generateEmployeeCodeList"
+            :page-sizes="[9]"
+          />
+        </div>
+        <div style="width: 200px;height: 40px">
+          <el-button type="primary" icon="el-icon-search"  size="mini"  v-print="printViewInfo">打印</el-button>
+        </div>
+      </div>
+    </div>
+    <div class="base" id="printView" >
+      <div class="box" style="page-break-after:always;margin-bottom: 10px">
+        <div class="ygmboxfj">
+          <!--卡片-->
+          <div class="ygmbox" v-for="(item,index) in listDate">
+            <div class="ygmbox_top">
+              <div class="tpdiv">
+                <img :src="item.images" style="width: 180px;height: 180px" alt="">
+              </div>
+            </div>
+            <div class="ygmbox_bottom">
+              <table  class="ygmbox_bottom_table">
+                <tr>
+                  <td  class="xingming">姓名</td>
+                  <td  class="xingmingValue">{{item.personnelName}}</td>
+                </tr>
+                <tr>
+                  <td class="gdName">工段</td>
+                  <td class="gdValue">{{item.processName}}</td>
+                </tr>
+              </table>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {generateEmployeeCodeList} from "@/api/amichi/planTask/planTaskDetails.js";
+import Table from "@/views/dragform/tableList.vue";
+
+export default {
+  name: "rkadyPrint",
+  components: {Table},
+  data () {
+    return {
+      queryParams:{
+        pageNum: 1,
+        pageSize: 9,
+        userIds:[],
+      },
+      total:0,
+      listDate:[],
+      dialogVisible: false,
+      msg: "打印",
+      printViewInfo: {
+        id: "printView", //打印区域的唯一的id属性
+        // popTitle: '配置页眉标题', // 页眉文字 （不设置时显示undifined）（页眉页脚可以在打印页面的更多设置的选项中取消勾选）
+        // extraHead: '打印，印刷', // 最左上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+        preview: false, // 是否启动预览模式，默认是false （开启预览模式ture会占满整个屏幕，不建议开启，除非业务需要）
+        // previewTitle: '预览的标题', // 打印预览的标题(预览模式preview为true时才显示)
+        // previewPrintBtnLabel: '预览结束，开始打印', // 打印预览的标题下方的按钮文本，点击可进入打印(预览模式preview为true时才显示)
+        zIndex: 20002, // 预览窗口的z-index，默认是20002，最好比默认值更高
+        previewBeforeOpenCallback (that) { console.log('正在加载预览窗口！'); console.log(that.msg, this) }, // 预览窗口打开之前的callback (预览模式preview为true时才执行) （that可以取到data里的变量值）
+        previewOpenCallback () { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback (预览模式preview为true时才执行)
+        beforeOpenCallback () { console.log('开始打印之前！') }, // 开始打印之前的callback
+        openCallback () { console.log('执行打印了！') }, // 调用打印时的callback
+        closeCallback () { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+        clickMounted () { console.log('点击v-print绑定的按钮了！') },
+        // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+        // asyncUrl (reslove) {
+        //   setTimeout(() => {
+        //     reslove('http://localhost:8080/')
+        //   }, 2000)
+        // },
+        standard: '',
+        extarCss: '',
+        isDataLoaded: false,
+      }
+    }
+  },
+  methods: {
+    //渲染表格内容
+    async generateEmployeeCodeList(){
+      let res = await generateEmployeeCodeList(this.queryParams)
+      if (res.code == 200) {
+        this.listDate = res.rows;
+        this.total = res.total;
+        this.isDataLoaded = true;
+      }
+    },
+  },
+  mounted() {
+  },
+  created(){
+    this.queryParams.userIds =this.$route.query.orderNumberSTwo;
+    console.log(this.queryParams.userIds,"1111111111111");
+    // let obj={"userIds":this.queryParams.orderNumberList}
+    // console.log(obj)
+    this.generateEmployeeCodeList();
+  },
+}
+
+</script>
+<style media="print" scoped>
+::v-deep .pagination-container {
+  margin-top: -10px;
+}
+@media print {
+  /* 隐藏页眉页脚 */
+  @page {
+    margin: 0 auto;
+    size: auto;
+    .box{
+      margin-top: 10px;
+    }
+  }
+  html {
+    zoom: 100%; /* 缩放比例设置 */
+  }
+  .noprint {
+    display: none; /* 隐藏打印区域不需要打印的内容 */
+  }
+}
+.base {
+  .page-break {
+    page-break-after: always;
+    position: relative;
+  }
+
+  .tools {
+    margin-top: 10px;
+    display: flex;
+    justify-content: flex-end;
+    margin-bottom: 10px;
+  }
+
+  .box {
+    font-size: 21px;
+    width: 800px;
+    //border: 1px solid red;
+    margin-bottom: 10px;
+    margin: 0 auto;
+
+    .ygmboxfj {
+      width: 800px;
+      margin: 0 auto;
+      display: flex;
+      //border: 1px solid red;
+      justify-content: flex-start;
+      flex-wrap: wrap;
+
+      .ygmbox {
+        width: 240px;
+        height: 315px;
+        border: 2px solid black;
+        margin-top: 20px;
+        //overflow: hidden;
+         margin-left: 19px;
+        .ygmbox_top {
+          //overflow: hidden;
+          width: 180px;
+          height: 180px;
+          margin: 0 auto;
+          margin-top: 30px;
+
+          .tpdiv {
+            width: 180px;
+            height: 180px;
+            //border: 1px solid gold;
+            margin-top: 27px;
+          }
+        }
+
+        .ygmbox_bottom {
+          width: 240px;
+          height: 86px;
+          //background-color: red;
+          margin-top: 26px;
+
+          .ygmbox_bottom_table {
+            width: 99%;
+            text-align: center;
+            border-left: 0px;
+            border-right: 0px;
+            border-bottom: 0px;
+
+            tr {
+              td {
+                height: 38px;
+              }
+
+              .xingming {
+                width: 30%;
+                border-top: 2px solid black;
+                border-bottom: 2px solid black;
+                border-right: 2px solid black
+              }
+
+              .xingming {
+                width: 30%;
+                border-top: 2px solid black;
+                border-bottom: 2px solid black;
+                border-right: 2px solid black
+              }
+
+              .xingmingValue {
+                width: 40%;
+                border-top: 2px solid black;
+                border-bottom: 2px solid black
+              }
+
+              .gdName {
+                width: 20%;
+                border-right: 2px solid black
+              }
+
+              .gdValue {
+                width: 30%;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>

zkqy-ui/src/views/amichi/procedureList/erplist/index.vue

@@ -31,7 +31,6 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['erpProcessList:erpProcess:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -42,7 +41,6 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['erpProcessList:erpProcess:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -53,7 +51,6 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['erpProcessList:erpProcess:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -63,7 +60,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['erpProcessList:erpProcess:export']"
+
         >导出</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -73,7 +70,6 @@
           icon="el-icon-back"
           size="mini"
           @click="fhsy"
-          v-hasPermi="['erpProcessList:erpProcess:export']"
         >返回上一页</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -106,6 +102,7 @@
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
+      :page-sizes="[50]"
     />
 
     <!-- 添加或修改erpProcess对话框 -->
@@ -157,7 +154,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 50,
         procedureNumber: null,
         procedurName: null,
         remarks: null,

zkqy-ui/src/views/amichi/procedureList/list/index.vue

@@ -31,7 +31,6 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['procedureList:list:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -42,7 +41,6 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['procedureList:list:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -53,7 +51,6 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['procedureList:list:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -63,7 +60,6 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['procedureList:list:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -100,6 +96,7 @@
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
+      :page-sizes="[50]"
     />
 
     <!-- 添加或修改工序列表对话框 -->
@@ -171,7 +168,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 50,
         procedureNumber: null,
         procedurName: null,
         remarks: null,

zkqy-ui/src/views/amichi/ringScanInformation/index.vue

@@ -91,12 +91,12 @@
     <el-table v-loading="loading" style="margin-top: 15px" :data="informationList" @selection-change="handleSelectionChange">
 <!--      <el-table-column type="selection" width="55" align="center" />-->
 <!--      <el-table-column label="主键" align="center" prop="id" />-->
-      <el-table-column label="人员姓名" align="center" prop="personnelName" />
-      <el-table-column label="工序" align="center" prop="processName" />
-      <el-table-column label="工位" align="center" prop="stationName" />
+      <el-table-column label="人员姓名"  sortable align="center" prop="personnelName" />
+      <el-table-column label="工序"  sortable align="center" prop="processName" />
+      <el-table-column label="工位"  align="center" prop="stationName" />
       <el-table-column label="设备名称" align="center" prop="deviceNumber" />
       <el-table-column label="扫描内容" align="center" prop="contentInformation" />
-      <el-table-column label="扫描时间" align="center" prop="scanningTime" width="180">
+      <el-table-column label="扫描时间" sortable align="center" prop="scanningTime" width="180">
 <!--        <template slot-scope="scope">-->
 <!--          <span>{{ parseTime(scope.row.scanningTime, '{y}-{m}-{d}') }}</span>-->
 <!--        </template>-->
@@ -121,6 +121,7 @@
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
+      :page-sizes="[50]"
     />
 
     <!-- 添加或修改指环王扫描日志信息对话框 -->
@@ -213,7 +214,7 @@ export default {
       queryParams: {
         executionMark:1,
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 50,
         deviceNumber: null,
         deviceName: null,
         scanningTime: null,

zkqy-ui/src/views/amichi/shopRoom/index.vue

@@ -176,6 +176,7 @@
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
+      :page-sizes="[50]"
     />
 
     <!-- 添加或修改物料信息对话框 -->
@@ -312,7 +313,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 50,
         materialCode: null,
         materialName: null,
         model: null,

zkqy-ui/src/views/amichi/stationInformation/indexCopyV4.vue

@@ -57,7 +57,6 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['amichi:stationInformation:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -68,7 +67,6 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['amichi:stationInformation:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -79,18 +77,16 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['amichi:stationInformation:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
+          type="primary"
           plain
-          icon="el-icon-download"
+          icon="el-icon-plus"
           size="mini"
-          @click="handleExport"
-          v-hasPermi="['amichi:stationInformation:export']"
-        >导出</el-button>
+          @click="dyygmxi"
+        >打印员工码信息</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -130,6 +126,7 @@
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
+      :page-sizes="[50]"
     />
 
     <!-- 添加或修改工位信息对话框 -->
@@ -190,7 +187,7 @@
       <div class="mBox" id="printView">
          <div class="top">
             <div class="topnr">
-              <img :src="imgBase" alt="" style="text-align: center;width:320px;height: 320px">
+              <img :src="imgBase" alt="" style="text-align: center;width:320px;height: 320px;">
             </div>
          </div>
           <div class="bottom" style="border-bottom: 2px solid black;border-top: 2px solid black">
@@ -257,6 +254,7 @@ export default {
       currentUserName:"",
       //二维码信息
       imgBase:"",
+      personnelId:"",
       // 遮罩层
       loading: true,
       // 选中数组
@@ -278,7 +276,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 50,
         stationCode: null,
         stationName: null,
         personnelId: null,
@@ -307,6 +305,20 @@ export default {
     this.getList();
   },
   methods: {
+    dyygmxi(){
+      if(this.personnelId.length<=0){
+        console.log("请先勾选对应数据");
+        this.$message.warning("请先勾选对应数据");
+        return;
+      }
+      // console.log(this.personnelId);
+      this.$router.push({
+        path: '/amichi/print/ygmPrint',
+        query: {
+          "orderNumberSTwo": this.personnelId,
+        }
+      });
+    },
     processNametSelected(){
       let obj = this.processList.find(item=>item.value==this.form.processId);
       console.log(obj,"dddd");
@@ -445,6 +457,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
+      this.personnelId=selection.map(item => item.personnelId);
       this.single = selection.length!==1
       this.multiple = !selection.length
     },

zkqy-ui/src/views/amichi/system/user/index.vue

@@ -229,47 +229,52 @@
                 <el-button type="warning" plain size="small">
                   处理<i class="el-icon-arrow-down el-icon--right"></i>
                 </el-button>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item>
+                <el-dropdown-menu slot="dropdown" style="width: 100px">
+                  <el-dropdown-item style="padding: 0px">
                     <el-button
                       size="mini"
                       type="text"
                       icon="el-icon-edit"
                       @click="printEmployeeCode(scope.row)"
                       v-hasPermi="['system:user:edit']"
-                    >打印员工码
+                      style="width: 100%"
+                    >员工码
                     </el-button>
                   </el-dropdown-item>
-                  <el-dropdown-item>
+                  <el-dropdown-item style="padding: 0px">
                     <el-button
                       size="mini"
                       type="text"
                       icon="el-icon-edit"
                       @click="handleUpdate(scope.row)"
                       v-hasPermi="['system:user:edit']"
+                      style="width: 100%"
                       >修改
                     </el-button>
                   </el-dropdown-item>
-                  <el-dropdown-item>
+                  <el-dropdown-item style="padding: 0px">
                     <el-button
                       size="mini"
                       type="text"
                       icon="el-icon-delete"
                       @click="handleDelete(scope.row)"
+                      style="width: 100%"
                       v-hasPermi="['system:user:remove']"
                       >删除
                     </el-button>
                   </el-dropdown-item>
-                  <el-dropdown-item>
+                  <el-dropdown-item style="padding: 0px">
                     <el-dropdown
                       size="mini"
                       @command="(command) => handleCommand(command, scope.row)"
                       v-hasPermi="['system:user:resetPwd', 'system:user:edit']"
+                      style="width: 100%"
                     >
                       <el-button
                         size="mini"
                         type="text"
                         icon="el-icon-d-arrow-right"
+                        style="width: 100%"
                         >更多
                       </el-button>
                       <el-dropdown-menu slot="dropdown">
@@ -375,7 +380,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="角色">
+            <el-form-item label="角色" v-if="$store.state.user.name == 'fjqyAdmin'">
               <el-select
                 v-model="form.roleIds"
                 multiple
@@ -387,6 +392,7 @@
                   :label="item.roleName"
                   :value="item.roleId"
                   :disabled="item.status == 1"
+
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -788,6 +794,8 @@ export default {
         this.deptOptions = response.data;
       });
     },
+    // 订单号-型号嘛
+    // 订单号-型号嘛
     // 筛选节点
     filterNode(value, data) {
       if (!value) return true;

zkqy-ui/src/views/login.vue

@@ -307,10 +307,10 @@ export default {
             Cookies.remove("rememberMe");
           }
           let form = {
-               uri: "?client_id=hmc&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.1.249:8066/oauth/callback",
+                // uri: "?client_id=hmc&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.2.190:8066/oauth/callback",
                // uri:"?client_id=mestools&scope=basic&response_type=code&state=AB1357&redirect_uri=http://62.234.61.92:8055/oauth/callback",
                // uri:"?client_id=mestools&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.128.171:8066/oauth/callback",
-               // uri:"?client_id=mestools&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.2.135:8066/oauth/callback",
+               uri:"?client_id=mestools&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.2.135:8066/oauth/callback",
              //uri:"?client_id=hmc&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.110.85:8066/oauth/callback",
              //uri:"?client_id=hmc&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.110.83:8066/oauth/callback",
             // uri:"?client_id=hmc&scope=basic&response_type=code&state=AB1357&redirect_uri=http://172.20.10.5:8066/oauth/callback",

zkqy-ui/vue.config.js

@@ -42,9 +42,9 @@ module.exports = {
         // target: `http://192.168.110.83:8066`,
         // target: `http://192.168.128.171:8066`,
         // target: `http://192.168.2.135:8066`, //铨一开发
-        target: `http://192.168.1.249:8066`,
+        // target: `http://192.168.2.190:8066`,
         // target: `http://62.234.61.92:8055`,
-        // target: `http://192.168.2.135:8066`,
+        target: `http://192.168.2.135:8066`,
         //  target: `http://192.168.128.171:8066`,
         //  target: `http://192.168.3.17:8066`,
         changeOrigin: true,