From 6ea3d5caa30f460f1eb9c3880d90f41275c3c274 Mon Sep 17 00:00:00 2001
From: yangyang
Date: 星期四, 03 七月 2025 09:25:08 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-wms/src/main/resources/mapper/asrs/OrderMapper.xml | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-wms/src/main/resources/mapper/asrs/OrderMapper.xml b/zy-asrs-wms/src/main/resources/mapper/asrs/OrderMapper.xml
index 25f3c01..2add054 100644
--- a/zy-asrs-wms/src/main/resources/mapper/asrs/OrderMapper.xml
+++ b/zy-asrs-wms/src/main/resources/mapper/asrs/OrderMapper.xml
@@ -1,5 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.wms.asrs.mapper.OrderMapper">
-
-</mapper>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.wms.asrs.mapper.OrderMapper">
+
+ <select id="getDetlForOrderId" resultType="com.zy.asrs.wms.asrs.entity.dto.OrderInfoDto">
+ SELECT
+ odl.id AS detl_id,
+ odl.order_id,
+ odl.order_no,
+ odl.anfme,
+ odl.qty,
+ odl.work_qty,
+ odl.batch,
+ odl.anfme - odl.qty - work_qty AS merge_num,
+ mm.matnr,
+ mm.maktx,
+ mm.specs,
+ mm.model,
+ mm.barcode
+ FROM
+ man_order_detl odl
+ INNER JOIN man_mat mm ON odl.mat_id = mm.id
+ WHERE odl.deleted = 0 AND odl.`status` = 1
+ <if test="orderId != null">
+ AND odl.order_id = #{orderId}
+ </if>
+ </select>
+</mapper>
--
Gitblit v1.9.1