Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 05:42:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

改为orders

Browse Source
This commit is contained in:
lym
2024-06-17 16:07:29 +08:00
parent 283d46e492
commit 387de1e86a
19 changed files with 108 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/OrderDO.java
+1 -1
View File
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import com.cf.imes.framework.mybatis.core.dataobject.BaseDO;
import lombok.*;
@TableName(value = "`order`") // 由于 SQL Server 的 system_user 是关键字，所以使用 system_users
@TableName(value = "`orders`") // 由于 SQL Server 的 system_user 是关键字，所以使用 system_users
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/plate/OrderPlateMapper.xml
+2 -2
View File
@@ -58,7 +58,7 @@
join order_item oi on op.id = oi.plate_id
join order_body ob on oi.body_id = ob.id
join `order` o on op.order_id = o.id
join `orders` o on op.order_id = o.id
join plate p on op.goods_id = p.goods_id
@@ -123,7 +123,7 @@
join order_item oi on op.id = oi.plate_id
join order_body ob on oi.body_id = ob.id
join `order` o on op.order_id = o.id
join `orders` o on op.order_id = o.id
join plate p on op.goods_id = p.goods_id
where op.id = #{plateId}
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.xml
+1 -1
View File
@@ -46,7 +46,7 @@
ops.processinfo_id as processID,
ops.type as processType
from order_process_step ops
join `order` o on ops.order_id = o.id and ops.organ_id = o.organ_id
join `orders` o on ops.order_id = o.id and ops.organ_id = o.organ_id
join order_process_step_item opsi on ops.id = opsi.process_step_id and ops.organ_id = opsi.organ_id
<where>
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProductionProcessMapper.xml
+1 -1
View File
@@ -41,7 +41,7 @@
p.material as material,
p.color as color
from `order` o
from `orders` o
join order_item oi on o.id = oi.order_id
join order_plate op on oi.plate_id = op.id
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.xml
+3 -3
View File
@@ -26,7 +26,7 @@
o.phone_number as customerPhone,
count(opn.order_id) as packageQuantity
from `order` o
from `orders` o
join order_package opn on o.id = opn.order_id and o.organ_id = opn.organ_id
where o.id = #{orderNo} and opn.status &lt;&gt; 0 and o.organ_id = #{organId} ;
@@ -85,7 +85,7 @@
when oi.plate_id !=0 then oi.plate_id end
)as totalPieceCount
FROM `order` o
FROM `orders` o
join order_item oi on o.id = oi.order_id and o.organ_id = oi.organ_id
WHERE
@@ -126,7 +126,7 @@
o.address as address,
((SELECT COUNT(t2.id) FROM order_package t2 WHERE t2.create_time &lt;= opn.create_time and t2.order_id =#{orderNo})) as packNum
from `order` o
from `orders` o
join order_package opn on o.id = opn.order_id and o.organ_id = opn.organ_id
where opn.order_id =#{orderNo} and opn.id = #{packageNo} and opn.status &lt;&gt; 0 and opn.organ_id = #{organId}