yonyou
/
tk2312-web
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
lihao 2025-09-25 10:55:51 +08:00
parent 3b157fb7aa fdaf26d720
commit fe43a5c53d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mmpac/mmpac/pmo/card/viewControl/btnClickController.js
View File

@ -673,14 +673,14 @@ export default function clickBtn(props, id, text, record, index) {
case "tomes": { case "tomes": {
rowIds = []; rowIds = [];
let billId = props.form.getFormItemsValue(formId, HEADATTRCODE.CPMOHID).value; let billId = props.form.getFormItemsValue(formId, HEADATTRCODE.CPMOHID).value;
// 传递设计任务 // 生产订单手动推艾普MES
rowIds[0] = billId; rowIds[0] = billId;
ajax({ ajax({
url: '/nccloud/mmpac/pmo/PmoToMes.do', url: '/nccloud/mmpac/pmo/PmoToMes.do',
data: {pks: rowIds}, data: {pks: rowIds},
success: (res) => { success: (res) => {
if (res.success) { if (res.success) {
toast({content: "传递设计任务成功", color: 'success'}); toast({content: "传递生产订单成功", color: 'success'});
} }
} }
}); });

2
src/mmpac/mmpac/pmo/pub/grand/index.js
View File

@ -335,7 +335,7 @@ class GrandDialog extends Component {
}} }}
// onShow={this.initHead(this.props)} // onShow={this.initHead(this.props)}
ref={(NCModal) => (this.NCModal = NCModal)} ref={(NCModal) => (this.NCModal = NCModal)}
size="xlg" size="max"
> >
<NCHotKeys <NCHotKeys
keyMap={{ keyMap={{

2
src/pu/pu/poorder/card/btnClicks/refAddLineComfirmBtnClick.js
View File

@ -99,7 +99,7 @@ export default function refAddLineComfirmBtnClick(array) {
npk_supplier = npk_supplier == null ? '' : npk_supplier; npk_supplier = npk_supplier == null ? '' : npk_supplier;
npk_org = npk_org == null || npk_org == '' ? null : npk_org; npk_org = npk_org == null || npk_org == '' ? null : npk_org;
// 先判断表头的 业务交易类型、供应商、采购组织 三个是否一致 不一致不能追加 // 先判断表头的 业务交易类型、供应商、采购组织 三个是否一致 不一致不能追加
if (octrantypeid == nctrantypeid && opk_supplier == npk_supplier && opk_org == npk_org) { if (octrantypeid == nctrantypeid && (opk_supplier == npk_supplier || npk_supplier =='') && opk_org == npk_org) {
cards[PAGECODE.cardbody].rows.map((o) => { cards[PAGECODE.cardbody].rows.map((o) => {
o.values.crowno = { display: null, value: null }; o.values.crowno = { display: null, value: null };
array.push({ index: rows++, data: o }); array.push({ index: rows++, data: o });