From 644c6b5f5808c49f59d27f2ed9400cc70c4dd22a Mon Sep 17 00:00:00 2001 From: sfd <sun.sunshine@163.com> Date: 星期五, 09 五月 2025 09:52:08 +0800 Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev --- aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java index d44a30b..4722333 100644 --- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java +++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java @@ -166,7 +166,7 @@ /*瀹氫箟宸ュ巶涓哄崡閫� */ String plantCode="FORTUNA"; /*瀹氫箟涓诲崟绫诲瀷涓洪挘閲戜富鍗�*/ - String mainOrderType = "閽i噾涓讳欢"; + String mainOrderType = "0"; /*鐢熸垚鏂版壒娆″彿*/ String batchNum= requireBatchService.getNewBatchNumber(); /*鑾峰彇閽i噾涓诲崟淇℃伅*/ @@ -277,10 +277,10 @@ require.setStartDate(startDay); /*璁$畻鏄惁鏈夐闄�*/ - require.setHasDelayRisk("鏃犻闄�"); + require.setHasDelayRisk("0"); Date dateZero = getDateZero(DateUtils.getNowDate()); if (startDay.before(dateZero)) { - require.setHasDelayRisk("鏈夐闄�"); + require.setHasDelayRisk("1"); } /*鐢熶骇鍩哄湴*/ -- Gitblit v1.9.3