add:设备档案打印功能

mes/hd/nladmin-system/src/main/java/org/nl/common/utils/MsgUtil.java

@@ -23,6 +23,19 @@ public class MsgUtil {
             default:;
         }
     }
+    public static void sendMsg(String msg, MsgSend msgType,String url){
+        switch (msgType){
+            case FS:
+                JSONObject body = new JSONObject();
+                body.set("msg_type","text");
+                body.set("content",MapOf.of("text",msg));
+                String resultMsg = HttpRequest.post(url)
+                        .body(body.toString())
+                        .execute().body();
+            case EMAIL:
+            default:;
+        }
+    }
     public enum MsgSend{
         FS,
         EMAIL

mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/rest/DevicerepairrequestController.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.utils.ImageCompress;
+import org.nl.common.utils.MapOf;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.common.utils.FileUtil;
@@ -59,7 +60,7 @@ public class DevicerepairrequestController {
     //@PreAuthorize("@el.check('devicerepairrequest:add')")
     public ResponseEntity<Object> create(@Validated @RequestBody DevicerepairrequestDto dto) {
         devicerepairrequestService.create(dto);
-        return new ResponseEntity<>(HttpStatus.CREATED);
+        return new ResponseEntity<>(MapOf.of("message","操作测功"),HttpStatus.CREATED);
     }
 
     @PutMapping

mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairmstServiceImpl.java

@@ -17,6 +17,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.common.utils.MsgUtil;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.system.util.CodeUtil;
@@ -33,6 +34,8 @@ import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattr
 import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr;
 import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
 import org.nl.wms.system_manage.service.dept.ISysDeptService;
+import org.nl.wms.system_manage.service.param.ISysParamService;
+import org.nl.wms.system_manage.service.param.dao.Param;
 import org.nl.wms.system_manage.service.tableData.ColumnInfoService;
 import org.nl.wms.system_manage.service.user.ISysUserService;
 import org.nl.wms.system_manage.service.user.dao.SysUser;
@@ -62,6 +65,8 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService {
     private final ClassstandardService classstandardService;
 //    private final StorattrService storattrService;
 //    private final SparePartOutServiceImpl sparePartOutService;
+    @Autowired
+    private ISysParamService paramService;
 
     @Autowired
     private EmBiIostorinvOutService emBiIostorinvOutService;
@@ -703,6 +708,15 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService {
                 jsonRequest.put("finish_name", nickName);
                 jsonRequest.put("finish_time", DateUtil.now());
                 requestTab.update(jsonRequest);
+                Param BXD_REPORT = paramService.getOne(new QueryWrapper<Param>().eq("code", "BXD_REPORT"));
+                if (BXD_REPORT !=null){
+                    JSONObject jsonFile = WQLObject.getWQLObject("EM_BI_EquipmentFile").query("devicerecord_id = '" + jsonRequest.getString("request_code") + "' and is_delete = '0'").uniqueResult(0);
+                    String device_name = "";
+                    if (jsonFile !=null){
+                        device_name = jsonFile.getString("device_name");
+                    }
+                    MsgUtil.sendMsg("报修设备:"+device_name+",报修单:"+jsonRequest.getString("request_code")+"检修完毕",MsgUtil.MsgSend.FS,BXD_REPORT.getValue());
+                }
             }
         }
     }

mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairrequestServiceImpl.java

@@ -13,6 +13,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.nl.common.utils.MsgUtil;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
@@ -207,6 +208,10 @@ public class DevicerepairrequestServiceImpl implements DevicerepairrequestServic
         dto.setStatus("01");
         dto.setCreate_id(currentUserId);
         dto.setCreate_name(nickName);
+        if (StringUtils.isEmpty(dto.getProduct_person_name())){
+            dto.setProduct_person_name(nickName);
+        }
+        dto.setCreate_name(nickName);
         dto.setCreate_time(now);
         dto.setSyscompanyid(Long.parseLong("1"));
         dto.setSysdeptid(Long.parseLong("1"));
@@ -214,7 +219,7 @@ public class DevicerepairrequestServiceImpl implements DevicerepairrequestServic
         WQLObject wo = WQLObject.getWQLObject("em_bi_devicerepairrequest");
         JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
         wo.insert(json);
-//        MsgUtil.sendMsg("lms报修提醒:报修人"+dto.getCreate_name()+",报修单"+dto.getRequest_code()+"故障描述"+dto.getFault_desc() ,MsgUtil.MsgSend.FS);
+        MsgUtil.sendMsg("lms报修提醒:报修人:"+dto.getCreate_name()+",报修单:"+dto.getRequest_code()+",故障描述:"+dto.getFault_desc() ,MsgUtil.MsgSend.FS);
     }
 
     @Override

mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/rest/DevicemaintenanceplanmstController.java

@@ -49,7 +49,7 @@ public class DevicemaintenanceplanmstController {
     @PostMapping("/queryDevice3")
     @ApiOperation("查询设备档案2")
     public ResponseEntity<Object> queryDevice3(@RequestBody JSONObject whereJson) {
-        PageRequest pageRequest =PageRequest.of(whereJson.getInteger("page"), whereJson.getInteger("size"));
+        PageRequest pageRequest =PageRequest.of(whereJson.getInteger("page")-1, whereJson.getInteger("size"));
         Map<String, Object> stringObjectMap = devicemaintenanceplanmstService.queryDevice2(whereJson, pageRequest);
         return new ResponseEntity<>(MapOf.of("data",stringObjectMap.get("content"),"totalCount",stringObjectMap.get("totalElements")), HttpStatus.OK);
     }

mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/index.vue

@@ -205,6 +205,16 @@
         >
           导入
         </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-printer"
+          size="mini"
+          @click="printP"
+        >
+          打印
+        </el-button>
       </crudOperation>
       <!--表格渲染-->
       <el-table
@@ -292,6 +302,7 @@ import crudDept, { getDeptTree } from '@/views/system/dept/dept'
 import crudClassstandard from '@/api/wms/basedata/master/classstandard'
 import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
 import { download } from '@/api/data'
+import { getLodop } from '@/assets/js/lodop/LodopFuncs'
 import { downloadFile } from '@/utils'
 import UploadDialog from '@/views/wms/device_manage/deviceFile/equipmentfile/UploadDialog'
 
@@ -354,6 +365,28 @@ export default {
     this.deptTree()
   },
   methods: {
+    printP() {
+      const _selectData = this.$refs.table.selection
+      if (!_selectData || _selectData.length < 1) {
+        this.crud.notify('请选择一条记录', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      for (let i = 0; i < _selectData.length; i++) {
+        const code = _selectData[i].device_code
+        console.log(code)
+        const LODOP = getLodop()
+        LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
+        // 打印纸张大小设置https://www.it610.com/article/2094844.html
+        LODOP.SET_PRINT_PAGESIZE(1, '70mm', '50mm', '')
+        // LODOP.ADD_PRINT_RECT('0mm', '0mm', '48mm', '28mm', 0, 1)
+        LODOP.ADD_PRINT_BARCODE('4.3mm', '10mm', '60mm', '40mm', '128Auto', code)
+        // LODOP.PREVIEW()// 预览
+        LODOP.PRINT()// 打印
+        this.crud.notify('打印成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.toQuery()
+      }
+    },
+
     canUd(row) {
       return row.status !== '00'
     },

mes/qd/src/views/wms/masterdata_manage/master/storagevehicleinfo/index.vue

@@ -402,9 +402,9 @@ export default {
         const LODOP = getLodop()
         LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
         // 打印纸张大小设置https://www.it610.com/article/2094844.html
-        LODOP.SET_PRINT_PAGESIZE(1, '50mm', '30mm', '')
+        LODOP.SET_PRINT_PAGESIZE(1, '60mm', '40mm', '1')
-        // LODOP.ADD_PRINT_RECT('0mm', '0mm', '48mm', '28mm', 0, 1)
+        // LODOP.ADD_PRINT_RECT('0mm', '0mm', '50mm', '30mm', 0, 1)
-        LODOP.ADD_PRINT_BARCODE('4.3mm', '8.2mm', '40mm', '20mm', '128Auto', code)
+        LODOP.ADD_PRINT_BARCODE('4.3mm', '8mm', '50mm', '30mm', '128Auto', code)
         // LODOP.PREVIEW()// 预览
         LODOP.PRINT()// 打印
         this.crud.notify('打印成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
@@ -445,9 +445,9 @@ export default {
           const LODOP = getLodop()
           LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
           // 打印纸张大小设置https://www.it610.com/article/2094844.html
-          LODOP.SET_PRINT_PAGESIZE(1, '50mm', '30mm', '1')
+          LODOP.SET_PRINT_PAGESIZE(1, '60mm', '40mm', '1')
           // LODOP.ADD_PRINT_RECT('0mm', '0mm', '50mm', '30mm', 0, 1)
-          LODOP.ADD_PRINT_BARCODE('4.3mm', '6.2mm', '40mm', '20mm', '128Auto', item)
+          LODOP.ADD_PRINT_BARCODE('4.3mm', '8mm', '50mm', '30mm', '128Auto', item)
           // LODOP.PREVIEW()// 预览
           LODOP.PRINT()// 打印
         })