Commit 36d34deaa86f58be61b6182696cafbd961e71364

Authored by chenxt
1 parent 15b93967

领料自动审核

src/components/Common/CommonInstructSet.js
@@ -865,7 +865,7 @@ const handleSave = (props, instruct) => { @@ -865,7 +865,7 @@ const handleSave = (props, instruct) => {
865 const data = []; 865 const data = [];
866 Object.keys(allSlaveData).forEach(key => { 866 Object.keys(allSlaveData).forEach(key => {
867 const config = props[`${key}Config`]; 867 const config = props[`${key}Config`];
868 - const saveTmpData = key === "master" ? (Array.isArray(masterData) ? masterData: [masterData]) : props[`${key}Data`]; 868 + const saveTmpData = key === "master" ? (Array.isArray(masterData) ? masterData : [masterData]) : props[`${key}Data`];
869 const delTmpData = key === "master" ? null : props[`${key}DelData`] || null; 869 const delTmpData = key === "master" ? null : props[`${key}DelData`] || null;
870 data.push( 870 data.push(
871 commonBusiness.mergeData(key, config.sTbName, saveTmpData, delTmpData) 871 commonBusiness.mergeData(key, config.sTbName, saveTmpData, delTmpData)
src/components/Common/commonBusiness.js
@@ -185,6 +185,34 @@ export async function saveData(param) { @@ -185,6 +185,34 @@ export async function saveData(param) {
185 } else { 185 } else {
186 message.success(optName + dataReturn.msg); 186 message.success(optName + dataReturn.msg);
187 } 187 }
  188 + /* 保存成功后自动审核:直接调用 doExamine 接口
  189 + 用保存载荷 value 里的 sSysLogSrcId(= masterData.sId)作为 sGuid;
  190 + 没有该字段的调用方(如列表保存)会跳过,不影响原行为 */
  191 + const bAutoCheck = value?.data?.find(x => x.name === 'master')?.column?.[0]?.bAutoCheck || false
  192 + if (bAutoCheck) {
  193 + const sGuid = value.sSysLogSrcId;
  194 + if (commonUtils.isNotEmptyStr(sGuid)) {
  195 + try {
  196 + await commonServices.postValueService(
  197 + token,
  198 + {
  199 + sClientType: '1',
  200 + paramsMap: {
  201 + iFlag: 1,
  202 + iTmpCheck: 0,
  203 + sFormGuid: sModelsId,
  204 + sGuid,
  205 + sSlaveId: '',
  206 + sBillNo: '',
  207 + },
  208 + },
  209 + `${commonConfig.server_host}business/doExamine?sModelsId=${sModelsId}`,
  210 + );
  211 + } catch (e) {
  212 + console.error('保存后自动审核失败:', e);
  213 + }
  214 + }
  215 + }
188 return dataReturn; 216 return dataReturn;
189 } else if (dataReturn.code === 2) { 217 } else if (dataReturn.code === 2) {
190 Modal.info({ 218 Modal.info({
@@ -195,7 +223,7 @@ export async function saveData(param) { @@ -195,7 +223,7 @@ export async function saveData(param) {
195 {dataReturn.msg} 223 {dataReturn.msg}
196 </div> 224 </div>
197 ), 225 ),
198 - onOk() {}, 226 + onOk() { },
199 }); 227 });
200 } else if (dataReturn.code === -7) { /* 防呆校验 返回是-7 */ 228 } else if (dataReturn.code === -7) { /* 防呆校验 返回是-7 */
201 return dataReturn; 229 return dataReturn;
@@ -314,7 +342,7 @@ export function getShowTypes(name, props) { @@ -314,7 +342,7 @@ export function getShowTypes(name, props) {
314 getFloatNum: props.getFloatNum, 342 getFloatNum: props.getFloatNum,
315 getDateFormat: props.getDateFormat, 343 getDateFormat: props.getDateFormat,
316 // onChange: props.onChange, 344 // onChange: props.onChange,
317 - onChange: () => {}, 345 + onChange: () => { },
318 formRoute: props.formRoute, 346 formRoute: props.formRoute,
319 } 347 }
320 } 348 }
@@ -1051,7 +1079,7 @@ export function handleUnitType(app, resultValue) { @@ -1051,7 +1079,7 @@ export function handleUnitType(app, resultValue) {
1051 } 1079 }
1052 export function showLocalMessage(props, sName, sChineseName) { 1080 export function showLocalMessage(props, sName, sChineseName) {
1053 let sTitle = ''; 1081 let sTitle = '';
1054 - if(commonUtils.isNotEmptyObject(props) && commonUtils.isNotEmptyObject(props.app) && commonUtils.isNotEmptyArr(props.app.commonConst)) { 1082 + if (commonUtils.isNotEmptyObject(props) && commonUtils.isNotEmptyObject(props.app) && commonUtils.isNotEmptyArr(props.app.commonConst)) {
1055 const gdsformconst = props.app.commonConst; 1083 const gdsformconst = props.app.commonConst;
1056 sTitle = showMessage(gdsformconst, sName) 1084 sTitle = showMessage(gdsformconst, sName)
1057 } else { 1085 } else {
@@ -1256,7 +1284,7 @@ export async function clearSocketData(param) { @@ -1256,7 +1284,7 @@ export async function clearSocketData(param) {
1256 message.destroy(); 1284 message.destroy();
1257 const { token, value, sModelsId } = param; 1285 const { token, value, sModelsId } = param;
1258 const { optName } = value; 1286 const { optName } = value;
1259 - const dataReturn = (await commonServices.postValueService( token, value, `${commonConfig.server_host}sysWebsocket/clearUserOperationRecord?sModelsId=${sModelsId}` )).data; 1287 + const dataReturn = (await commonServices.postValueService(token, value, `${commonConfig.server_host}sysWebsocket/clearUserOperationRecord?sModelsId=${sModelsId}`)).data;
1260 /* 成功的话返回数据 */ 1288 /* 成功的话返回数据 */
1261 if (dataReturn.code === 1) { /* 成功 */ 1289 if (dataReturn.code === 1) { /* 成功 */
1262 if (!commonUtils.isEmpty(optName)) { 1290 if (!commonUtils.isEmpty(optName)) {
src/mes/common/commonOperationBarComponent/index.js
@@ -71,7 +71,7 @@ const useCommonOperationBarComponentEvent = props =&gt; { @@ -71,7 +71,7 @@ const useCommonOperationBarComponentEvent = props =&gt; {
71 token, 71 token,
72 value: valuesNew, 72 value: valuesNew,
73 sModelsId, 73 sModelsId,
74 - bMachineTask: true 74 + bMachineTask: true,
75 }); 75 });
76 76
77 return returnData; 77 return returnData;