更新

2023-04-14 13:30:30 +08:00
parent bffdc995c0
commit 4b121f330b
4 changed files with 2 additions and 11 deletions
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql
@@ -55,19 +55,11 @@
 		SELECT
        	ShiftOrder.*,
        	material.material_code,
-<<<<<<< Updated upstream
-        	material.material_name,
-        	material.material_spec
-        FROM
-        	PDM_BD_WORKORDER ShiftOrder
-        	LEFT JOIN md_me_materialbase material ON material.material_id = ShiftOrder.material_id
-=======
        	device.device_name
        FROM
        	PDM_BD_WORKORDER ShiftOrder
        	LEFT JOIN md_me_materialbase material ON material.material_id = ShiftOrder.material_id
        	LEFT JOIN pdm_bi_device device ON ShiftOrder.device_id = device.device_id
->>>>>>> Stashed changes
        WHERE
        	ShiftOrder.is_delete = '0'
            OPTION 输入.unFinish <> ""
--- a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls