diff --git a/shared/resource/jsons/dic_goods.json b/shared/resource/jsons/dic_goods.json index ab61c4c5d..a91321cc3 100644 --- a/shared/resource/jsons/dic_goods.json +++ b/shared/resource/jsons/dic_goods.json @@ -49503,7 +49503,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "&", + "composeMaterial": "60001&3", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -49542,7 +49542,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60001&3", + "composeMaterial": "60002&3", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -49581,7 +49581,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60002&3", + "composeMaterial": "60003&3", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -49620,7 +49620,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60003&3", + "composeMaterial": "60004&3", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -49659,7 +49659,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60004&3", + "composeMaterial": "60005&3", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -49698,7 +49698,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60005&3", + "composeMaterial": "60006&3|17057&9", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -49737,7 +49737,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60006&3|17057&9", + "composeMaterial": "60007&3|17057&9", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -49776,7 +49776,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60007&3|17057&9", + "composeMaterial": "60008&3|17057&9", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -49815,7 +49815,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60008&3|17057&9", + "composeMaterial": "&", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -49854,7 +49854,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "&", + "composeMaterial": "60011&3", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -49893,7 +49893,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60011&3", + "composeMaterial": "60012&3", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -49932,7 +49932,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60012&3", + "composeMaterial": "60013&3", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -49971,7 +49971,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60013&3", + "composeMaterial": "60014&3", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -50010,7 +50010,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60014&3", + "composeMaterial": "60015&3", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -50049,7 +50049,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60015&3", + "composeMaterial": "60016&3|17057&9", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -50088,7 +50088,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60016&3|17057&9", + "composeMaterial": "60017&3|17057&9", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -50127,7 +50127,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60017&3|17057&9", + "composeMaterial": "60018&3|17057&9", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -50166,7 +50166,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60018&3|17057&9", + "composeMaterial": "&", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -50205,7 +50205,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "&", + "composeMaterial": "60021&3", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -50244,7 +50244,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60021&3", + "composeMaterial": "60022&3", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -50283,7 +50283,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60022&3", + "composeMaterial": "60023&3", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -50322,7 +50322,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60023&3", + "composeMaterial": "60024&3", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -50361,7 +50361,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60024&3", + "composeMaterial": "60025&3", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -50400,7 +50400,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60025&3", + "composeMaterial": "60026&3|17057&9", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -50439,7 +50439,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60026&3|17057&9", + "composeMaterial": "60027&3|17057&9", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -50478,7 +50478,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60027&3|17057&9", + "composeMaterial": "60028&3|17057&9", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -50517,7 +50517,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60028&3|17057&9", + "composeMaterial": "&", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -50556,7 +50556,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "&", + "composeMaterial": "60031&3", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -50595,7 +50595,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60031&3", + "composeMaterial": "60032&3", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -50634,7 +50634,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60032&3", + "composeMaterial": "60033&3", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -50673,7 +50673,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60033&3", + "composeMaterial": "60034&3", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -50712,7 +50712,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60034&3", + "composeMaterial": "60035&3", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -50751,7 +50751,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60035&3", + "composeMaterial": "60036&3|17057&9", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -50790,7 +50790,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60036&3|17057&9", + "composeMaterial": "60037&3|17057&9", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -50829,7 +50829,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60037&3|17057&9", + "composeMaterial": "60038&3|17057&9", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -50868,7 +50868,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60038&3|17057&9", + "composeMaterial": "&", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -50907,7 +50907,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "&", + "composeMaterial": "60041&3", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -50946,7 +50946,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60041&3", + "composeMaterial": "60042&3", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -50985,7 +50985,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60042&3", + "composeMaterial": "60043&3", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -51024,7 +51024,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60043&3", + "composeMaterial": "60044&3", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -51063,7 +51063,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60044&3", + "composeMaterial": "60045&3", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -51102,7 +51102,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60045&3", + "composeMaterial": "60046&3|17057&9", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -51141,7 +51141,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60046&3|17057&9", + "composeMaterial": "60047&3|17057&9", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -51180,7 +51180,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60047&3|17057&9", + "composeMaterial": "60048&3|17057&9", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -51219,7 +51219,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60048&3|17057&9", + "composeMaterial": "&", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -51258,7 +51258,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "&", + "composeMaterial": "60051&3", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -51297,7 +51297,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60051&3", + "composeMaterial": "60052&3", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -51336,7 +51336,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60052&3", + "composeMaterial": "60053&3", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -51375,7 +51375,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60053&3", + "composeMaterial": "60054&3", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -51414,7 +51414,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60054&3", + "composeMaterial": "60055&3", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -51453,7 +51453,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60055&3", + "composeMaterial": "60056&3|17057&9", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -51492,7 +51492,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60056&3|17057&9", + "composeMaterial": "60057&3|17057&9", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -51531,7 +51531,7 @@ "goodType": 5, "pieces": 0, "pieceId": 0, - "composeMaterial": "60057&3|17057&9", + "composeMaterial": "60058&3|17057&9", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&", @@ -51570,7 +51570,7 @@ "goodType": 1, "pieces": 0, "pieceId": 0, - "composeMaterial": "60058&3|17057&9", + "composeMaterial": "&", "specialMaterial": "&", "suitId": "&", "decomposeItem": "&",