设备领用查看代码提交

src/main/java/com/glxp/api/controller/inv/DeviceReceiveOrderController.java

@@ -223,6 +223,7 @@ public class DeviceReceiveOrderController {
             for (DeptDeviceDetailResponse obj : deptDeviceDetailResponseList) {
                 Map<String, Object> supData = new HashMap<>();
                 supData.put("orderIdFk", obj.getOrderIdFk() == null ? ' ' : obj.getOrderIdFk());
+                supData.put("code", obj.getCode() == null ? ' ' : obj.getCode());
                 supData.put("batchNo", obj.getBatchNo() == null ? ' ' : obj.getBatchNo());
                 supData.put("productionDate",  obj.getProductionDate() == null ? ' ' : obj.getProductionDate());
                 supData.put("expireDate",  obj.getExpireDate() == null ? ' ' : obj.getExpireDate());
@@ -242,7 +243,8 @@ public class DeviceReceiveOrderController {
             }
         }
 
-        String param = JSON.toJSONString(list);
+        data.put("data",list);
+        String param = JSON.toJSONString(data);
         JasperUtils.jasperReport(request, response, param, filePath + "pdf/template/" + systemPDFTemplateEntity.getPath(), "pdf");
     }
 

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

@@ -125,5 +125,7 @@ public class DeviceReceiveOrderResponse {
      */
     private String fromInvSpaceName;
 
+    private String auditUserName;
+
 
 }

src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_wmd?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:
@@ -49,11 +49,13 @@ logging:
 file_path: D:/udi/udiwms/udiwmsfile/
 file_lpath: /udiwms/image/register/file/getImage
 file_url: http://127.0.0.1:9991
+
+
 UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df
 UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test
 SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs
-SPMS_WEBSOCKET_TOKEN: 07rKFDFkQvBkbxgc7aUBlONo4gWNdx8b
 back_file_path: D:/share/udisps/back/
 API_KEY: 1101
 API_SECRET: zBITspLNvuoEd4FaamlSoqxRHmNsmQ6L
 WEB_TITLE: 平潭协和医院
+SPMS_WEBSOCKET_TOKEN: 07rKFDFkQvBkbxgc7aUBlONo4gWNdx8b

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

@@ -14,6 +14,7 @@
         dro.fromInvSpaceCode,
         dro.receiveUser,
         au.employeeName as receiveUserName,
+        aur.employeeName as auditUserName,
         ( SELECT `name` FROM auth_dept WHERE CODE = dro.fromDeptCode ) fromDeptName,
         ( SELECT `code` FROM auth_dept WHERE CODE = dro.fromDeptCode ) fromDeptCode,
         ( SELECT `name` FROM auth_warehouse WHERE CODE = dro.fromInvCode ) fromInvName,
@@ -22,6 +23,7 @@
         FROM
         device_receive_order dro
         left join auth_user au on au.id = dro.receiveUser
+        left join auth_user aur on aur.id = dro.auditUser
         <where>
             <if test="status != null">
                 AND status = #{status}