qiangmj / ebc-Mes

Commit d170b9973bd216c1cd5c49ec32086e0fd7bac092

Authored by Min
1 parent d3524137

1.处理MES生产执行英文版界面展示

Inline Side-by-side
Showing 10 changed files with 95 additions and 55 deletions
src/components/Common/CommonHooks/useCommonBase.js
  View file @d170b99
... ... @@ -1950,7 +1950,9 @@ const useCommonBase = props => {
1950 1950 } = params;
1951 1951  
1952 1952 const currentState = nextProps || state;
1953   -
  1953 + const FriendlyReminder = commonFunc.showLocalMessage(props, 'FriendlyReminder', '温馨提示');
  1954 + const BtnSure = commonFunc.showLocalMessage(props, 'BtnSure', '确认');
  1955 + const BtnCancel = commonFunc.showLocalMessage(props, 'BtnCancel', '确认');
1954 1956 // 加入mes通用参数
1955 1957 const { app } = props;
1956 1958 const { tableNameCompareJson = {} } = currentState;
... ... @@ -2129,10 +2131,10 @@ const useCommonBase = props => {
2129 2131 onSuccess && onSuccess(true);
2130 2132 } else if (code === -7) {
2131 2133 Modal.confirm({
2132   - title: "温馨提示:",
  2134 + title: FriendlyReminder,
2133 2135 content: <div>{handleGetMsg(msg)}</div>,
2134   - okText: "确认",
2135   - cancelText: "取消",
  2136 + okText: BtnSure,
  2137 + cancelText: BtnCancel,
2136 2138 onOk() {
2137 2139 handleProcedureCall(params, 1);
2138 2140 },
... ...
src/components/Common/CommonTable/index.js
  View file @d170b99
... ... @@ -11878,6 +11878,11 @@ const useCommonTableEvent = props =&gt; {
11878 11878 );
11879 11879 return decimalPlaces;
11880 11880 }
  11881 + const TotalReported = commonFunc.showLocalMessage(props, 'TotalReported', '已报合计');
  11882 + const Trayproduction = commonFunc.showLocalMessage(props, 'Trayproduction', '托盘产量');
  11883 + const Outputproduction = commonFunc.showLocalMessage(props, 'Outputproduction', '报工产量');
  11884 + const Workinghours = commonFunc.showLocalMessage(props, 'Workinghours', '计时工时');
  11885 + const pieceworkHours = commonFunc.showLocalMessage(props, 'pieceworkHours', '计件工时');
11881 11886  
11882 11887 if (
11883 11888 (["12710101117087404588200", "12710101117260270570210"].includes(
... ... @@ -11912,14 +11917,14 @@ const useCommonTableEvent = props =&gt; {
11912 11917 );
11913 11918 return (
11914 11919 <div className={styles.totalDiv}>
11915   - <div className="total">已报合计</div>
11916   - <div className="totalName">计件工时:</div>
  11920 + <div className="total">{TotalReported}</div>
  11921 + <div className="totalName">{pieceworkHours}:</div>
11917 11922 <div className="totalValue">{dWageHour}</div>
11918   - <div className="totalName">计时工时:</div>
  11923 + <div className="totalName">{Workinghours}:</div>
11919 11924 <div className="totalValue">{dTimeHour}</div>
11920   - <div className="totalName">报工产量:</div>
  11925 + <div className="totalName">{Outputproduction}:</div>
11921 11926 <div className="totalValue">{dProcessQty}</div>
11922   - <div className="totalName">托盘产量:</div>
  11927 + <div className="totalName">{Trayproduction}</div>
11923 11928 <div className="totalValue">{dReportQtySum}</div>
11924 11929 </div>
11925 11930 );
... ...
src/mes/common/buttonComponent/index.js
  View file @d170b99
... ... @@ -20,11 +20,11 @@ const ButtonComponent = props =&gt; {
20 20  
21 21 if ([3, 4, 5, 6].includes(iTeamType)) {
22 22 const scheduledTasks = managementData.find(
23   - item => item.sMenuName === "计划任务"
  23 + item => (item.sMenuName === "计划任务" || item.sMenuName?.trim() === "Scheduled Tasks")
24 24 );
25 25 if (scheduledTasks && scheduledTasks.children) {
26 26 const iIndex = scheduledTasks.children.findIndex(
27   - child => child.sMenuName === "生产返工"
  27 + child => (child.sMenuName === "生产返工" || child.sMenuName?.trim() === "Production Rework")
28 28 );
29 29 if (iIndex !== -1) {
30 30 scheduledTasks.children.splice(iIndex, 1);
... ... @@ -32,23 +32,35 @@ const ButtonComponent = props =&gt; {
32 32 }
33 33  
34 34 const restArr = [];
35   - if (iTeamType === 3) {
36   - restArr.push("研发工艺参数");
37   - } else if ([4, 5].includes(iTeamType)) {
38   - restArr.push("研发工艺参数(烫金)");
39   - restArr.push("研发工艺参数(模切)");
40   - } else if (iTeamType === 6) {
41   - restArr.push("研发工艺参数(丝印)");
  35 + if(userinfo?.sLanguage ==='sEnglish') {
  36 + if (iTeamType === 3) {
  37 + restArr.push("研发工艺参数");
  38 + } else if ([4, 5].includes(iTeamType)) {
  39 + restArr.push("研发工艺参数(烫金)");
  40 + restArr.push("研发工艺参数(模切)");
  41 + } else if (iTeamType === 6) {
  42 + restArr.push("研发工艺参数(丝印)");
  43 + }
  44 + } else{
  45 + if (iTeamType === 3) {
  46 + restArr.push("R&D Process Parameters");
  47 + } else if ([4, 5].includes(iTeamType)) {
  48 + restArr.push("R&D Process Parameters (Hot Stampinging)");
  49 + restArr.push("R&D Process Parameters (Die-Cutting)");
  50 + } else if (iTeamType === 6) {
  51 + restArr.push("R&D Process Parameters (Screen Printing)");
  52 + }
42 53 }
43 54 const productionExecMain = managementData.find(
44   - item => item.sMenuName === "生产执行"
  55 + item => (item.sMenuName === "生产执行" || item.sMenuName === "Production Execution")
45 56 );
46   - if (productionExecMain && productionExecMain.children) {
  57 + console.log('productionExecMain', productionExecMain);
  58 + if ( productionExecMain && productionExecMain.children) {
47 59 const forLength = productionExecMain.children.length;
48 60 for (let i = 0; i < forLength; i++) {
49 61 const iIndex = productionExecMain.children.findIndex(
50 62 child =>
51   - !["生产执行", "质量巡检", "研发改版记录", ...restArr].includes(
  63 + !["生产执行", "质量巡检", "研发改版记录", "Production Execution", "Quality Inspection", "R&D Revision Records", ...restArr].includes(
52 64 child.sMenuName
53 65 )
54 66 );
... ... @@ -59,12 +71,12 @@ const ButtonComponent = props =&gt; {
59 71 }
60 72 } else {
61 73 const productionExecMain = managementData.find(
62   - item => item.sMenuName === "生产执行"
  74 + item => (item.sMenuName === "生产执行" || item.sMenuName === "Production Execution")
63 75 );
64 76 if (productionExecMain && productionExecMain.children) {
65 77 for (let i = 0; i < 4; i++) {
66 78 const iIndex = productionExecMain.children.findIndex(child =>
67   - child.sMenuName.includes("研发工艺参数")
  79 + child.sMenuName.includes("研发工艺参数") || child.sMenuName.includes("R&D Process Parameters")
68 80 );
69 81 if (iIndex !== -1) {
70 82 productionExecMain.children.splice(iIndex, 1);
... ... @@ -75,12 +87,12 @@ const ButtonComponent = props =&gt; {
75 87  
76 88 if (sWorkshopId !== "20240511102738376607209385783909") {
77 89 const productionExecMain = managementData.find(
78   - item => item.sMenuName === "生产执行"
  90 + item => (item.sMenuName === "生产执行" || item.sMenuName === "Production Execution")
79 91 );
80 92 if (productionExecMain && productionExecMain.children) {
81 93 const iIndex = productionExecMain.children.findIndex(child =>
82   - child.sMenuName.includes("研发改版记录")
83   - );
  94 + (child.sMenuName.includes("研发改版记录") || child.sMenuName.includes("R&D Revision Records"))
  95 + );
84 96 if (iIndex !== -1) {
85 97 productionExecMain.children.splice(iIndex, 1);
86 98 }
... ... @@ -257,7 +269,7 @@ const ButtonComponent = props =&gt; {
257 269 }
258 270 menuList.push(result);
259 271 });
260   -
  272 + console.log('menuList:', menuList);
261 273 dataList.forEach(item => {
262 274 if (!menuList.some(item1 => item1.name === item.name)) {
263 275 const iIndex = menuList.findIndex(item1 => !item1);
... ... @@ -265,6 +277,8 @@ const ButtonComponent = props =&gt; {
265 277 }
266 278 });
267 279  
  280 + console.log('dataList:', dataList);
  281 +
268 282 // 点击
269 283 const itemClick = e => {
270 284 const { id, disabled, sName } = e;
... ...
src/mes/common/commonOperationBarComponent/index.js
  View file @d170b99
... ... @@ -1275,11 +1275,11 @@ const BarcodeComponent = props =&gt; {
1275 1275 document.body.removeEventListener("keypress", keypressEvent);
1276 1276 };
1277 1277 }, []);
1278   -
  1278 + const clickScan = commonFunc.showLocalMessage(props, 'clickScan', '请鼠标点击后扫码');
1279 1279 return (
1280 1280 <div className={styles.barcode}>
1281 1281 <Input
1282   - placeholder="请鼠标点击后扫码"
  1282 + placeholder={clickScan}
1283 1283 value={value}
1284 1284 onChange={event => {
1285 1285 if (value && scanEventTime.current === -1) {
... ...
src/mes/common/inputMultiModalComponent/index.js
  View file @d170b99
... ... @@ -13,12 +13,14 @@ const InputMultiModalComponent = props =&gt; {
13 13 sId: commonUtils.createSid(),
14 14 sMemo: value.replace(/；/g, ",")
15 15 });
  16 + const dpSelect = commonFunc.showLocalMessage(props, 'dpSelect', '下拉选择');
16 17  
  18 + const content = commonFunc.showLocalMessage(props, 'content', '内容');
17 19 const viewConfigs = [
18 20 {
19 21 sId: showConfig.sId + "1",
20 22 sName: "sMemo",
21   - showName: "内容",
  23 + showName: content,
22 24 sControlName: "",
23 25 iRowValue: 6,
24 26 iColValue: 24
... ... @@ -26,7 +28,7 @@ const InputMultiModalComponent = props =&gt; {
26 28 {
27 29 ...showConfig,
28 30 sName: "sSelect",
29   - showName: "下拉选择",
  31 + showName: dpSelect,
30 32 bCanInput: true,
31 33 iColValue: 24
32 34 }
... ...
src/mes/login/index.js
  View file @d170b99
... ... @@ -261,6 +261,9 @@ const useLoginEvent = props =&gt; {
261 261 bDelayedOvertime
262 262 } = dataReturn.dataset.rows[0];
263 263  
  264 +
  265 + console.log('vvvv', managementData);
  266 +
264 267 gdslogininfo.bDelayedOvertime = bDelayedOvertime;
265 268 const userinfo = { ...teamInfo, ...gdslogininfo };
266 269 const {
... ...
src/mes/operationGuide/index.less
  View file @d170b99
... ... @@ -55,7 +55,7 @@
55 55 }
56 56  
57 57 .cellBox {
58   - height: 40px;
  58 + height: 52px;
59 59 }
60 60  
61 61 .colExpire {
... ... @@ -75,7 +75,7 @@
75 75 text-align: center;
76 76 // color: #fff;
77 77 font-size: 16px;
78   - line-height: 1.4;
  78 + line-height: 1;
79 79 }
80 80  
81 81 &.front .hasShow {
... ... @@ -245,4 +245,4 @@
245 245 }
246 246 }
247 247 }
248   -}
249 248 \ No newline at end of file
  249 +}
... ...
src/mes/productionExec/productionExecMain/index.js
  View file @d170b99
... ... @@ -536,7 +536,8 @@ const ProductionExecContentByType = props =&gt; {
536 536 setPagesLoading,
537 537 refreshCount = 0
538 538 } = props;
539   -
  539 + const PRrevisionEnd = commonFunc.showLocalMessage(props, 'Proofreading/revisionEnd', '装校版结束');
  540 + const PRrevisionStart = commonFunc.showLocalMessage(props, 'Proofreading/revisionStart', '装校版开始');
540 541 /**
541 542 * 设备状态值
542 543 */
... ... @@ -556,7 +557,7 @@ const ProductionExecContentByType = props =&gt; {
556 557  
557 558 const showValue = {
558 559 stop: {
559   - showName: "装校版结束",
  560 + showName: PRrevisionEnd,
560 561 onClick: config =>
561 562 operationFetch(props, config, undefined, () => {
562 563 props.onSaveState({
... ... @@ -566,7 +567,7 @@ const ProductionExecContentByType = props =&gt; {
566 567 })
567 568 },
568 569 again: {
569   - showName: "装校版开始",
  570 + showName: PRrevisionStart,
570 571 onClick: config =>
571 572 operationFetch(props, config, "again", () => {
572 573 props.onSaveState({
... ... @@ -758,7 +759,13 @@ const ProductionExecContent = props =&gt; {
758 759 if (!oNavList) return;
759 760 oNavList.childNodes[index].click();
760 761 };
761   -
  762 + const MCR = commonFunc.showLocalMessage(props, 'MCR', '物料消耗登记');
  763 + const PMCR = commonFunc.showLocalMessage(props, 'PMCR', '版材消耗登记');
  764 + const Blanking = commonFunc.showLocalMessage(props, 'finishConstruction', '下料');
  765 + const product1 = commonFunc.showLocalMessage(props, 'product1', '产量①');
  766 + const product2 = commonFunc.showLocalMessage(props, 'product2', '产品②');
  767 + const revoke = commonFunc.showLocalMessage(props, 'revoke', '撤销');
  768 + const abnormal3 = commonFunc.showLocalMessage(props, 'abnormal3', '异常③');
762 769 return (
763 770 <div className={styles.type1}>
764 771 <div className="topPart">
... ... @@ -775,7 +782,7 @@ const ProductionExecContent = props =&gt; {
775 782 {...btnProps}
776 783 {...getBtnConfigByControlName("BtnEventBlanking")}
777 784 >
778   - 下料
  785 + {Blanking}
779 786 </Button>
780 787 </Space>
781 788 <Space>
... ... @@ -783,13 +790,13 @@ const ProductionExecContent = props =&gt; {
783 790 {...btnProps}
784 791 {...getBtnConfigByControlName("BtnPrint1")}
785 792 >
786   - 产量①
  793 + {product1}
787 794 </Button>
788 795 <Button
789 796 {...btnProps}
790 797 {...getBtnConfigByControlName("BtnPrint2")}
791 798 >
792   - 产品②
  799 + {product2}
793 800 </Button>
794 801 {/* <Button {...btnProps}>产品②</Button> */}
795 802 </Space>
... ... @@ -802,7 +809,7 @@ const ProductionExecContent = props =&gt; {
802 809 {...btnProps}
803 810 {...getBtnConfigByControlName("BtnCancel")}
804 811 >
805   - 撤销
  812 + {revoke}
806 813 </Button>
807 814 </Space>
808 815 <Space className="rightPart">
... ... @@ -810,7 +817,7 @@ const ProductionExecContent = props =&gt; {
810 817 {...btnProps}
811 818 {...getBtnConfigByControlName("BtnPrint3")}
812 819 >
813   - 异常③
  820 + {abnormal3}
814 821 </Button>
815 822 {/* <Button {...btnProps}>撤销</Button> */}
816 823 </Space>
... ... @@ -862,14 +869,14 @@ const ProductionExecContent = props =&gt; {
862 869 size="large"
863 870 onClick={changeTab.bind(this, 0)}
864 871 >
865   - 物料消耗登记
  872 + {MCR}
866 873 </Button>
867 874 <Button
868 875 type="primary"
869 876 size="large"
870 877 onClick={changeTab.bind(this, 2)}
871 878 >
872   - 版材消耗登记
  879 + {PMCR}
873 880 </Button>
874 881 </Space>
875 882 </div>
... ... @@ -1014,6 +1021,13 @@ const ProductionExecContent0 = props =&gt; {
1014 1021 },
1015 1022 noGetData: !selectedRowKeys.length
1016 1023 };
  1024 + const Blanking = commonFunc.showLocalMessage(props, 'finishConstruction', '下料');
  1025 + const product1 = commonFunc.showLocalMessage(props, 'product1', '产量①');
  1026 + const product2 = commonFunc.showLocalMessage(props, 'product2', '产品②');
  1027 + const Revoke = commonFunc.showLocalMessage(props, 'revoke', ' 撤销');
  1028 + const abnormal3 = commonFunc.showLocalMessage(props, 'abnormal3', '异常③');
  1029 + const MCR = commonFunc.showLocalMessage(props, 'MCR', '物料消耗登记');
  1030 + const PMCR = commonFunc.showLocalMessage(props, 'PMCR', '版材消耗登记');
1017 1031  
1018 1032 const tabRef = useRef();
1019 1033 const changeTab = index => {
... ... @@ -1039,7 +1053,7 @@ const ProductionExecContent0 = props =&gt; {
1039 1053 {...btnProps}
1040 1054 {...getBtnConfigByControlName("BtnEventBlanking")}
1041 1055 >
1042   - 下料
  1056 + {Blanking}
1043 1057 </Button>
1044 1058 </Space>
1045 1059 <Space>
... ... @@ -1047,13 +1061,13 @@ const ProductionExecContent0 = props =&gt; {
1047 1061 {...btnProps}
1048 1062 {...getBtnConfigByControlName("BtnPrint1")}
1049 1063 >
1050   - 产量①
  1064 + {product1}
1051 1065 </Button>
1052 1066 <Button
1053 1067 {...btnProps}
1054 1068 {...getBtnConfigByControlName("BtnPrint2")}
1055 1069 >
1056   - 产品②
  1070 + {product2}
1057 1071 </Button>
1058 1072 {/* <Button {...btnProps}>产品②</Button> */}
1059 1073 </Space>
... ... @@ -1066,7 +1080,7 @@ const ProductionExecContent0 = props =&gt; {
1066 1080 {...btnProps}
1067 1081 {...getBtnConfigByControlName("BtnCancel")}
1068 1082 >
1069   - 撤销
  1083 + {Revoke}
1070 1084 </Button>
1071 1085 </Space>
1072 1086 <Space className="rightPart">
... ... @@ -1074,7 +1088,7 @@ const ProductionExecContent0 = props =&gt; {
1074 1088 {...btnProps}
1075 1089 {...getBtnConfigByControlName("BtnPrint3")}
1076 1090 >
1077   - 异常③
  1091 + {abnormal3}
1078 1092 </Button>
1079 1093 {/* <Button {...btnProps}>撤销</Button> */}
1080 1094 </Space>
... ... @@ -1126,14 +1140,14 @@ const ProductionExecContent0 = props =&gt; {
1126 1140 size="large"
1127 1141 onClick={changeTab.bind(this, 0)}
1128 1142 >
1129   - 物料消耗登记
  1143 + {MCR}
1130 1144 </Button>
1131 1145 <Button
1132 1146 type="primary"
1133 1147 size="large"
1134 1148 onClick={changeTab.bind(this, 2)}
1135 1149 >
1136   - 版材消耗登记
  1150 + {PMCR}
1137 1151 </Button>
1138 1152 </Space>
1139 1153 </div>
... ...
src/mes/scheduledTasks/machineTasks/index.js
  View file @d170b99
... ... @@ -560,7 +560,7 @@
560 560  
561 561 return [
562 562 { showName, btnBgColor, sDefault, startWorkConfig, pauseWorkConfig },
563   - { showName: "完工", btnBgColor: "#1890FF", sDefault }
  563 + { showName: finishConstruction, btnBgColor: "#1890FF", sDefault }
564 564 ];
565 565  
566 566 // return [
... ...
src/mes/teamInfo/index.js
  View file @d170b99
... ... @@ -555,8 +555,8 @@ const TeamInfo = baseProps =&gt; {
555 555 const classGroup = commonFunc.showLocalMessage(props, 'classGroup', '班组');
556 556  
557 557 const foreman = commonFunc.showLocalMessage(props, 'foreman', '领班');
558   - console.log('2222', teamInformation);
559 558  
  559 + const ClearOut = commonFunc.showLocalMessage(props, 'ClearOut', '清空');
560 560  
561 561 return (
562 562 <div className={styles.teamInfo}>
... ... @@ -622,7 +622,7 @@ const TeamInfo = baseProps =&gt; {
622 622 </ul>
623 623 <div style={{ 'position': 'relative' }}>
624 624 <CommonViewTable {...viewProps} className="temporaryIpqc"></CommonViewTable>
625   - <Button style={{ 'position': 'absolute' , 'top': '20%' ,'right': '2%'}} type="primary" onClick={() => { clearTempIpqc() }} > 清空 </Button>
  625 + {/*<Button style={{ 'position': 'absolute' , 'top': '20%' ,'right': '2%'}} type="primary" onClick={() => { clearTempIpqc() }} > {ClearOut} </Button>*/}
626 626 </div>
627 627  
628 628 </div>
... ...