From 3483410c693b26d9d1a72eba4dae89f61aa87edb Mon Sep 17 00:00:00 2001
From: hao <1836460075@qq.com>
Date: 星期二, 20 五月 2025 18:50:35 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~yhj/XM_GK_HD
---
gdbg/gdbg/Controllers/PrintController.cs | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/gdbg/gdbg/Controllers/PrintController.cs b/gdbg/gdbg/Controllers/PrintController.cs
index ee526ec..a694643 100644
--- a/gdbg/gdbg/Controllers/PrintController.cs
+++ b/gdbg/gdbg/Controllers/PrintController.cs
@@ -23,8 +23,12 @@
try
{
// 淇敼 SQL 鏌ヨ浠ヨ繑鍥炴洿澶氬瓧娈�
- string query = "SELECT ITEM_BARCODE, TO_CHAR(a.CREATE_DATE, 'YYYY-MM-DD HH24:MI:SS') AS PRINT_DATE, b.STAFF_NAME,a.quantity " +
- "FROM MES_INV_ITEM_BARCODES a left join MES_STAFF b on a.CREATE_BY=b.STAFF_NO " +
+ string query =
+
+ " SELECT a.ITEM_BARCODE, TO_CHAR(a.CREATE_DATE, 'YYYY-MM-DD HH24:MI:SS') AS PRINT_DATE, bgr.bgr, a.quantity " +
+ " FROM MES_INV_ITEM_BARCODES a left join(select case when sta.STAFF_NAME is null then a.CREATE_BY else sta.STAFF_NAME end bgr,a.ITEM_BARCODE " +
+ " from MES_WORK_PROD_C_DETAILS a left join mes_staff sta on a.CREATE_BY = sta.STAFF_NO) bgr on bgr.ITEM_BARCODE = a.ITEM_BARCODE " +
+ " left join MES_STAFF b on a.CREATE_BY = b.STAFF_NO " +
"WHERE BILL_NO = :orderNo and TO_CHAR(a.CREATE_DATE, 'YYYY-MM-DD')<=to_char(SYSDATE,'YYYY-MM-DD') and TO_CHAR(a.CREATE_DATE, 'YYYY-MM-DD')>=to_char(SYSDATE-2,'YYYY-MM-DD') " +
"order by a.CREATE_DATE desc";
--
Gitblit v1.9.3