From bdb10f17dd56fdb8dd8e3dca897c5cfb5e40a75d Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 16 六月 2026 14:01:12 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/mock/prompt/MockDataPrompt.java | 60 +++++++++++++++++++++++++++++++-----------------------------
1 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/ruoyi/mock/prompt/MockDataPrompt.java b/src/main/java/com/ruoyi/mock/prompt/MockDataPrompt.java
index f37b56e..6e81263 100644
--- a/src/main/java/com/ruoyi/mock/prompt/MockDataPrompt.java
+++ b/src/main/java/com/ruoyi/mock/prompt/MockDataPrompt.java
@@ -19,10 +19,11 @@
1. 杈撳嚭蹇呴』鏄函JSON鏁扮粍锛屼笉瑕佺敤markdown浠ｇ爜鍧楀寘瑁癸紝涓嶈鏈変换浣曞叾浠栨枃瀛�
2. 姣忎釜JSON瀵硅薄蹇呴』鍖呭惈 "entity" 瀛楁锛屽�间负瀹炰綋绫诲瀷鍚�
3. 鏁版嵁鍐呭瑕佺鍚堟寚瀹氳涓氱殑鐗瑰緛锛堝叕鍙稿悕绉般�佷骇鍝佸悕绉般�佽仈绯讳汉绛夎鍍忚琛屼笟鐨勶級
- 4. 鏃ユ湡瀛楁鍦ㄦ寚瀹氱殑鏃堕棿鑼冨洿鍐呴殢鏈哄垎甯�
+ 4. 鎵�鏈夋棩鏈熷瓧娈靛繀椤诲湪鎸囧畾鐨勬椂闂磋寖鍥村唴锛屼弗绂佷娇鐢ㄨ寖鍥翠箣澶栫殑鏃ユ湡
5. 閲戦銆佹暟閲忕瓑鏁板�煎瓧娈佃鍚堢悊
6. 鍚屼竴妯″潡鍐呯殑瀹炰綋涔嬮棿瑕佹湁寮曠敤鍏崇郴锛堝閿�鍞彴璐﹀紩鐢ㄥ鎴峰悕绉帮級
7. 鎵�鏈夊瓧绗︿覆瀛楁涓嶈浣跨敤emoji鎴栫壒娈妘nicode瀛楃
+ 8. 鍚堝悓缂栧彿銆佹壒鍙风瓑鍖呭惈鏃ユ湡鐨勫瓧娈碉紝蹇呴』浣跨敤鏃堕棿鑼冨洿鍐呯殑鏃ユ湡锛屼笉瑕佷娇鐢ㄧず渚嬩腑鐨勫叿浣撴棩鏈�
""";
}
@@ -55,13 +56,13 @@
sb.append(buildPurchasePrompt(countMin, countMax, dateStart, dateEnd));
}
if (modules.contains("quality")) {
- sb.append(buildQualityPrompt(countMin, countMax));
+ sb.append(buildQualityPrompt(countMin, countMax, dateStart));
}
if (modules.contains("production")) {
sb.append(buildProductionPrompt(countMin, countMax, dateStart, dateEnd));
}
if (modules.contains("stock")) {
- sb.append(buildStockPrompt(countMin, countMax));
+ sb.append(buildStockPrompt(countMin, countMax, dateStart));
}
sb.append("\n璇风洿鎺ヨ緭鍑篔SON鏁扮粍锛屼笉瑕佹湁浠讳綍鍏朵粬鍐呭:");
@@ -70,7 +71,7 @@
private static String buildSalesPrompt(int min, int max, String dateStart, String dateEnd) {
return """
- 閿�鍞ā鍧� - 鎸変互涓嬫牸寮忕敓鎴�:
+ 閿�鍞ā鍧� - 鎸変互涓嬫牸寮忕敓鎴愶紙娉ㄦ剰锛氱ず渚嬩腑鐨勬棩鏈熶粎浣滄牸寮忓弬鑰冿紝瀹為檯鏃ユ湡蹇呴』鍦� %s ~ %s 鑼冨洿鍐咃級:
{
"entity": "customer",
"customerName": "XX绉戞妧鏈夐檺鍏徃",
@@ -81,7 +82,7 @@
"companyPhone": "0513-XXXXXXXX",
"taxpayerIdentificationNumber": "91110108XXXXXXXXXX",
"maintainer": "鏉庡洓",
- "maintenanceTime": "2026-06-01",
+ "maintenanceTime": "%s",
"bankAccount": "622202XXXXXXXXXXXX",
"basicBankAccount": "XX閾惰XX鏀",
"bankCode": "308100XXXXXX"
@@ -89,15 +90,15 @@
{
"entity": "salesLedger",
"customerName": "寮曠敤涓婇潰鐢熸垚鐨勫鎴峰悕绉�",
- "salesContractNo": "XS-20260601-001",
+ "salesContractNo": "XS-骞存湀鏃�-搴忓彿",
"projectName": "XX椤圭洰",
- "entryDate": "2026-06-01",
+ "entryDate": "%s",
"entryPerson": "寮犱笁",
"salesman": "閿�鍞憳濮撳悕",
"contractAmount": 50000.00,
"paymentMethod": "鏈堢粨30澶�",
- "executionDate": "2026-06-01",
- "deliveryDate": "2026-07-01",
+ "executionDate": "%s",
+ "deliveryDate": "%s",
"type": 1,
"productData": [
{
@@ -113,15 +114,15 @@
}
]
}
- 瀹㈡埛鍚嶇О瑕佸儚鎸囧畾琛屼笟鐨勫叕鍙革紝鍚堝悓缂栧彿鏍煎紡XS-骞存湀鏃�-搴忓彿锛岄噾棰濆悎鐞嗐��
+ 瀹㈡埛鍚嶇О瑕佸儚鎸囧畾琛屼笟鐨勫叕鍙革紝鍚堝悓缂栧彿鏍煎紡XS-骞存湀鏃�-搴忓彿锛堝勾鏈堟棩鍙杄ntryDate鐨勬棩鏈燂級锛岄噾棰濆悎鐞嗐��
娉ㄦ剰 taxExclusiveTotalPrice 鏄笉鍚◣鎬讳环锛岄渶瑕佹牴鎹惈绋庢�讳环鍜岀◣鐜囪绠楋紙=鍚◣鎬讳环/(1+绋庣巼/100)锛夈��
鏃ユ湡鑼冨洿: %s ~ %s锛屾瘡绉嶅疄浣撶敓鎴�%d-%d鏉°��
- """.formatted(dateStart, dateEnd, min, max);
+ """.formatted(dateStart, dateEnd, dateStart, dateStart, dateStart, dateEnd, dateStart, dateEnd, min, max);
}
private static String buildPurchasePrompt(int min, int max, String dateStart, String dateEnd) {
return """
- 閲囪喘妯″潡 - 鎸変互涓嬫牸寮忕敓鎴�:
+ 閲囪喘妯″潡 - 鎸変互涓嬫牸寮忕敓鎴愶紙娉ㄦ剰锛氱ず渚嬩腑鐨勬棩鏈熶粎浣滄牸寮忓弬鑰冿紝瀹為檯鏃ユ湡蹇呴』鍦� %s ~ %s 鑼冨洿鍐咃級:
{
"entity": "supplier",
"supplierName": "XX鍘熸潗鏂欐湁闄愬叕鍙�",
@@ -138,12 +139,12 @@
{
"entity": "purchaseLedger",
"supplierName": "寮曠敤涓婇潰鐢熸垚鐨勪緵搴斿晢鍚嶇О",
- "purchaseContractNumber": "CG-20260601-001",
+ "purchaseContractNumber": "CG-骞存湀鏃�-搴忓彿",
"projectName": "XX閲囪喘椤圭洰",
- "entryDate": "2026-06-01",
+ "entryDate": "%s",
"contractAmount": 30000.00,
"paymentMethod": "璐у埌浠樻",
- "executionDate": "2026-06-01",
+ "executionDate": "%s",
"productData": [
{
"productId": 1,
@@ -158,68 +159,69 @@
}
]
}
- 渚涘簲鍟嗗悕绉拌鍍忔寚瀹氳涓氱殑渚涘簲鍟嗭紝鍚堝悓缂栧彿鏍煎紡CG-骞存湀鏃�-搴忓彿銆�
+ 渚涘簲鍟嗗悕绉拌鍍忔寚瀹氳涓氱殑渚涘簲鍟嗭紝鍚堝悓缂栧彿鏍煎紡CG-骞存湀鏃�-搴忓彿锛堝勾鏈堟棩鍙杄ntryDate鐨勬棩鏈燂級銆�
娉ㄦ剰 taxExclusiveTotalPrice 鏄笉鍚◣鎬讳环锛岄渶瑕佹牴鎹惈绋庢�讳环鍜岀◣鐜囪绠楋紙=鍚◣鎬讳环/(1+绋庣巼/100)锛夈��
鏃ユ湡鑼冨洿: %s ~ %s锛屾瘡绉嶅疄浣撶敓鎴�%d-%d鏉°��
- """.formatted(dateStart, dateEnd, min, max);
+ """.formatted(dateStart, dateEnd, dateStart, dateStart, dateStart, dateEnd, min, max);
}
- private static String buildQualityPrompt(int min, int max) {
+ private static String buildQualityPrompt(int min, int max, String dateStart) {
return """
璐ㄩ噺妯″潡 - 鎸変互涓嬫牸寮忕敓鎴�:
{
"entity": "qualityTestStandard",
- "standardNo": "QTS-20260601-001",
+ "standardNo": "QTS-骞存湀鏃�-搴忓彿",
"standardName": "XX浜у搧妫�楠屾爣鍑�",
"inspectType": 0,
"remark": "閫傜敤浜嶺X琛屼笟鐨勮川閲忔楠屾爣鍑�"
}
inspectType: 0=鍘熸潗鏂欐楠�, 1=杩囩▼妫�楠�, 2=鍑哄巶妫�楠屻�備笁绉嶇被鍨嬮兘瑕佽鐩栥��
+ standardNo涓殑骞存湀鏃ヤ娇鐢� %s 杩欎釜鏃ユ湡銆�
{
"entity": "qualityTestStandardBinding",
"productId": 1,
"testStandardId": 1
}
姣忕瀹炰綋鐢熸垚%d-%d鏉°��
- """.formatted(min, max);
+ """.formatted(dateStart, min, max);
}
private static String buildProductionPrompt(int min, int max, String dateStart, String dateEnd) {
return """
- 鐢熶骇妯″潡 - 鎸変互涓嬫牸寮忕敓鎴�:
+ 鐢熶骇妯″潡 - 鎸変互涓嬫牸寮忕敓鎴愶紙娉ㄦ剰锛氱ず渚嬩腑鐨勬棩鏈熶粎浣滄牸寮忓弬鑰冿紝瀹為檯鏃ユ湡蹇呴』鍦� %s ~ %s 鑼冨洿鍐咃級:
{
"entity": "productionPlan",
"productModelId": 1,
"qtyRequired": 200,
- "requiredDate": "2026-06-15",
+ "requiredDate": "%s",
"source": "閿�鍞�",
- "promisedDeliveryDate": "2026-07-01",
+ "promisedDeliveryDate": "%s",
"remark": "XX瀹㈡埛璁㈠崟闇�姹�"
}
{
"entity": "productionOrder",
"productModelId": 1,
"quantity": 200,
- "planCompleteTime": "2026-06-30",
+ "planCompleteTime": "%s",
"remark": "鏍规嵁鐢熶骇璁″垝XX鐢熸垚"
}
productionPlan鐨剆ource鍙��"閿�鍞�"鎴�"鍐呴儴"銆�
鏃ユ湡鑼冨洿: %s ~ %s锛屾瘡绉嶅疄浣撶敓鎴�%d-%d鏉°��
- """.formatted(dateStart, dateEnd, min, max);
+ """.formatted(dateStart, dateEnd, dateStart, dateEnd, dateEnd, dateStart, dateEnd, min, max);
}
- private static String buildStockPrompt(int min, int max) {
+ private static String buildStockPrompt(int min, int max, String dateStart) {
return """
搴撳瓨妯″潡 - 鎸変互涓嬫牸寮忕敓鎴�:
{
"entity": "stockInventory",
"productModelId": 1,
"qualitity": 500,
- "batchNo": "BATCH-20260601-001",
+ "batchNo": "BATCH-骞存湀鏃�-搴忓彿",
"warnNum": 50,
"remark": "瀹夊叏搴撳瓨"
}
- 姣忕瀹炰綋鐢熸垚%d-%d鏉°�俠atchNo鏍煎紡BATCH-骞存湀鏃�-搴忓彿銆�
- """.formatted(min, max);
+ 姣忕瀹炰綋鐢熸垚%d-%d鏉°�俠atchNo鏍煎紡BATCH-骞存湀鏃�-搴忓彿锛屽勾鏈堟棩浣跨敤 %s 杩欎釜鏃ユ湡銆�
+ """.formatted(min, max, dateStart);
}
}
--
Gitblit v1.9.3