Browse Source

2025-12-24

pda其他入库提交时调用打印
master
fengyuan_yang 6 months ago
parent
commit
70557ca360
  1. 38
      src/main/java/com/gaotao/modules/otherInbound/controller/OtherInboundController.java
  2. 10
      src/main/java/com/gaotao/modules/otherInbound/dao/OtherInboundMapper.java
  3. 14
      src/main/resources/mapper/otherInbound/OtherInboundMapper.xml

38
src/main/java/com/gaotao/modules/otherInbound/controller/OtherInboundController.java

@ -2,6 +2,7 @@ package com.gaotao.modules.otherInbound.controller;
import com.gaotao.common.utils.R;
import com.gaotao.modules.otherInbound.service.OtherInboundService;
import com.gaotao.modules.otherInbound.dao.OtherInboundMapper;
import com.gaotao.modules.sys.controller.AbstractController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -23,6 +24,9 @@ public class OtherInboundController extends AbstractController {
@Autowired
private OtherInboundService otherInboundService;
@Autowired
private OtherInboundMapper otherInboundMapper;
/**
* 获取其他入库单列表
* 数据来源inbound_notification_head表类型为其他入库
@ -340,4 +344,38 @@ public class OtherInboundController extends AbstractController {
return R.error("添加物料失败: " + e.getMessage());
}
}
/**
* 获取用户默认打印机配置
* 根据 siteusernamelabelNo 查询配置的打印机名称
*/
@PostMapping("/getUserDefaultPrinter")
@ApiOperation("获取用户默认打印机配置")
public R getUserDefaultPrinter(@RequestBody Map<String, Object> params) {
try {
String username = (String) params.get("username");
String labelNo = (String) params.get("labelNo");
// 如果未传用户名使用当前登录用户
if (username == null || username.trim().isEmpty()) {
username = getUser().getUsername();
}
// 查询用户的打印机配置
Map<String, Object> printerConfig = otherInboundMapper.getUserDefaultPrinter(username, labelNo);
if (printerConfig != null && printerConfig.get("printerName") != null) {
return R.ok()
.put("printerName", printerConfig.get("printerName"))
.put("printerIp", printerConfig.get("printerIp"))
.put("labelNo", printerConfig.get("labelNo"));
}
// 没有配置打印机
return R.ok().put("printerName", null).put("printerIp", null);
} catch (Exception e) {
logger.error("获取用户默认打印机配置失败", e);
return R.error("获取打印机配置失败: " + e.getMessage());
}
}
}

10
src/main/java/com/gaotao/modules/otherInbound/dao/OtherInboundMapper.java

@ -69,4 +69,14 @@ public interface OtherInboundMapper {
* @return 已扫描标签列表
*/
List<Map<String, Object>> getScannedLabelList(Map<String, Object> params);
/**
* 获取用户默认打印机配置
* @param site 站点
* @param username 用户名
* @param labelNo 标签模板编号可选
* @return 打印机配置 {printerName, printerIp, labelNo}
*/
Map<String, Object> getUserDefaultPrinter(@Param("username") String username,
@Param("labelNo") String labelNo);
}

14
src/main/resources/mapper/otherInbound/OtherInboundMapper.xml

@ -150,4 +150,18 @@
ORDER BY RollNo DESC
</select>
<!-- 获取用户默认打印机配置 -->
<select id="getUserDefaultPrinter" resultType="map">
SELECT TOP 1
rfp.NewPrinterName AS printerName,
rfp.IPAddress AS printerIp,
rfp.ReportID AS labelNo
FROM ReportFileList_UserPrinter rfp
WHERE rfp.UserID = #{username}
<if test="labelNo != null and labelNo != ''">
AND rfp.ReportID = #{labelNo}
</if>
ORDER BY rfp.ReportID
</select>
</mapper>
Loading…
Cancel
Save