申请单退料修改

src/api/orderIssure/inboundNotification.js

@@ -6,3 +6,5 @@ export const createNotify = data => createAPI(`/orderIssure/issureNotify/createN
 export const getSOScheduledRoutingListForIssure= data => createAPI(`/orderIssure/issureNotify/getSOScheduledRoutingListForIssure`,'post',data)
 export const getNotifyNoDetail= data => createAPI(`/orderUnissue/unissueNotify/getNotifyNoDetail`,'post',data)
 export const searchNotifyMaterialList= data => createAPI(`/orderUnissue/unissueNotify/searchNotifyMaterialList`,'post',data)
+export const deleteNotifyUnissue= data => createAPI(`/orderUnissue/unissueNotify/deleteNotifyUnissue`,'post',data)
+export const searchUnissueNotifyMaterialList= data => createAPI(`/orderUnissue/unissueNotify/searchUnissueNotifyMaterialList`,'post',data)

src/api/orderIssure/productionInboundRequest.js

@@ -17,8 +17,6 @@ export const saveUnissueMaterialDetail= data => createAPI(`/orderUnissue/unissue
 
 export const deleteNotifyUnissue= data => createAPI(`/orderUnissue/unissueNotify/deleteNotifyUnissue`,'post',data)
 
-export const xiadaNotify= data => createAPI(`/orderIssure/issureNotify/xiadaNotify`,'post',data)
-
 export const searchNotifyOrderList= data => createAPI(`/orderIssure/issureNotify/searchNotifyOrderList`,'post',data)
 
 export const searchUnissueNotifyMaterialList= data => createAPI(`/orderUnissue/unissueNotify/searchUnissueNotifyMaterialList`,'post',data)
@@ -46,3 +44,7 @@ export const getSiteAndBuByUserName = data => createAPI(`/orderIssure/issureNoti
 export const getEamWorkShop = data => createAPI(`/orderIssure/issureNotify/getEamWorkShop`,'post',data)
 
 export const getIFSShopOrderByOrderNo = data => createAPI(`/orderUnissue/unissueNotify/getIFSShopOrderByOrderNo`,'post',data)
+
+export const getUnissueShopOrderAndMaterialByShoporder = data => createAPI(`/orderUnissue/unissueNotify/getUnissueShopOrderAndMaterialByShoporder`,'post',data)
+
+export const saveNewUnissueNotifyOrderList = data => createAPI(`/orderUnissue/unissueNotify/saveNewUnissueNotifyOrderList`,'post',data)

src/views/modules/orderIssure/inboundNotification.vue

@@ -15,10 +15,8 @@
       </el-form-item> -->
       <el-form-item :label="'单据状态'">
         <el-select multiple collapse-tags v-model="searchData.orderStatusList" clearable style="width: 160px">
-          <el-option label="草稿" value="UNISSUE"></el-option>
-          <el-option label="已下达" value="ISSUE"></el-option>
-          <el-option label="已完成" value="FINISH"></el-option>
-          <el-option label="已关闭" value="CLOSED"></el-option>
+          <el-option label="ISSUE" value="ISSUE"></el-option>
+          <el-option label="CLOSED" value="CLOSED"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="'申请单日期'">
@@ -49,8 +47,8 @@
     <el-table :height="height" :data="dataList" border v-loading="searchLoading" ref="inboundTable"
       :row-style="rowStyle" @row-click="inboundClickRow" @current-change="changeCurrentRow"
       @selection-change="selectionInbound" style="width: 100%;">
-      <el-table-column type="selection" header-align="center" align="center" width="50">
-      </el-table-column>
+      <!-- <el-table-column type="selection" header-align="center" align="center" width="50">
+      </el-table-column> -->
       <el-table-column v-for="(item,index) in columnList" :key="index" :sortable="item.columnSortable"
         :prop="item.columnProp" :header-align="item.headerAlign" :show-overflow-tooltip="item.showOverflowTooltip"
         :align="item.align" :fixed="item.fixed==''?false:item.fixed" :min-width="item.columnWidth"
@@ -130,14 +128,14 @@
     <!-- 页签 -->
     <el-tabs v-model="activeTable" style="width: 100%" :style="{height: secondHeight + 'px'}" type="border-card"
       @tab-click="tabClick" class="customer-tab">
-      <el-tab-pane label="入库明细" name="inboundDetail">
+      <el-tab-pane label="申请明细" name="inboundDetail">
         <!-- <el-form label-position="top" style="margin-left: 2px;">
           <el-button type="primary" @click="deleteInboundDetail()" icon="el-icon-delete">删除</el-button>
         </el-form> -->
         <el-table :data="detailList" :height="secondHeight - 68" border @selection-change="selectionInboundDetail"
           v-loading="searchLoading" style="width: 100%;">
-          <el-table-column type="selection" header-align="center" align="center" width="50">
-          </el-table-column>
+          <!-- <el-table-column type="selection" header-align="center" align="center" width="50">
+          </el-table-column> -->
           <el-table-column v-for="(item,index) in columnDetailList" :key="index" :sortable="item.columnSortable"
             :prop="item.columnProp" :header-align="item.headerAlign" :show-overflow-tooltip="item.showOverflowTooltip"
             :align="item.align" :fixed="item.fixed==''?false:item.fixed" :min-width="item.columnWidth"
@@ -175,9 +173,10 @@
           </el-table-column>
           <el-table-column prop="actualStockInQty" header-align="center" align="right" min-width="100" label="实际入库数量">
           </el-table-column> -->
-          <el-table-column fixed="right" header-align="center" align="center" width="90" label="操作">
+          <el-table-column fixed="right" header-align="center" align="center" width="100" label="操作">
             <template slot-scope="scope">
-              <el-link style="cursor: pointer" @click="enterSOSDetail(scope.row)">入库明细</el-link>
+              <a type="text" size="small" @click="enterSOSDetail(scope.row)">修改</a>
+              <a type="text" size="small" @click="deleteNotifySOS(scope.row)">删除</a>
             </template>
           </el-table-column>
         </el-table>
@@ -525,6 +524,8 @@ import {
   createNotify,
   getNotifyNoDetail,
   searchNotifyMaterialList,
+  deleteNotifyUnissue,
+  searchUnissueNotifyMaterialList
 } from '@/api/orderIssure/inboundNotification.js'
 import Chooselist from '@/views/modules/common/Chooselist_eam'
 import { getChooselist } from '@/api/chooselist/chooselist.js'
@@ -558,7 +559,7 @@ export default {
         orderNo: '',
         orderType: '',
         orderStatus: '',
-        orderStatusList: ['UNISSUE'],
+        orderStatusList: ['ISSUE'],
         startDate: '',
         endDate: '',
         page: 1,
@@ -1050,7 +1051,7 @@ export default {
           columnLabel: '物料编码',
           columnHidden: false,
           columnImage: false,
-          columnSortable: false,
+          columnSortable: true,
           sortLv: 0,
           status: true,
           fixed: '',
@@ -1130,24 +1131,6 @@ export default {
           fixed: '',
           columnWidth: 120,
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 701001,
-          serialNumber: '701001Table2PartNo',
-          tableId: '701001Table2',
-          tableName: '查询派工单',
-          columnProp: 'fgpartNo',
-          headerAlign: 'center',
-          align: 'left',
-          columnLabel: '物料编码',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 80,
-        },
         /* {
           userId: this.$store.state.user.name,
           functionId: 701001,
@@ -1185,24 +1168,6 @@ export default {
           fixed: '',
           columnWidth: 80,
         }, */
-        {
-          userId: this.$store.state.user.name,
-          functionId: 701001,
-          serialNumber: '701001Table2Qtyreported',
-          tableId: '701001Table2',
-          tableName: '查询派工单',
-          columnProp: 'unissureQty',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '退料数量',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 80,
-        },
         {
           userId: this.$store.state.user.name,
           functionId: 701001,
@@ -2239,7 +2204,7 @@ export default {
     searchUnissueNotifyMaterialList(row){
       this.bomLoadFlag = true
       this.materialModalFlag = true
-      searchNotifyMaterialList(row).then(({ data }) => {
+      searchUnissueNotifyMaterialList(row).then(({ data }) => {
         if (data.code === 0) {
           this.sobomList = data.rows    
         }
@@ -2266,6 +2231,32 @@ export default {
       })
     },
 
+    // 删除
+    deleteNotifySOS(row) {
+      this.$confirm(`是否删除这个工单的申请信息?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          deleteNotifyUnissue(row).then(({ data }) => {
+            if (data && data.code === 0) {
+              this.getNotifyNoDetail()
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {},
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定',
+              })
+            }
+          })
+        })
+        .catch(() => {})
+    },
     //获取按钮的权限数据
     getButtonAuthData() {
       if (this.$store.state.user.id === 1) {

src/views/modules/productionInbound/productionInboundRequest.vue

@@ -117,40 +117,31 @@
         </el-table>
       </el-tab-pane> -->
     </el-tabs>
-    <el-dialog title="选择工单" :close-on-click-modal="false" v-drag :visible.sync="seqNoModalFlag" width="1000px">
+    <el-dialog title="选择工单物料" :close-on-click-modal="false" v-drag :visible.sync="seqNoModalFlag" width="1200px">
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
         <el-row :gutter="20">
           <el-col :span="4">
-            <el-form-item :label="'生产订单号'">
-              <el-input v-model="seqNoData.orderNo"></el-input>
+            <el-form-item :label="'Order No'">
+              <el-input v-model="seqNoData.orderNo" @keyup.enter.native="searchSOSRouting()"></el-input>
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="4">
-            <el-form-item>
-              <span slot="label" style="" @click="getBaseList(216)"><a herf="#">加工中心</a></span>
-              <el-input v-model="seqNoData.sWorkcenterno"></el-input>
-            </el-form-item>
-          </el-col> -->
           <el-col :span="4">
-            <el-form-item :label="'日期'">
-              <el-date-picker style="width: 100%" v-model="seqNoData.startDate" type="date" value-format="yyyy-MM-dd"
-                placeholder="选择日期">
-              </el-date-picker>
+            <el-form-item :label="'Release No'">
+              <el-input v-model="seqNoData.releaseNo"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item :label="'到'">
-              <el-date-picker style="width: 100%" v-model="seqNoData.endDate" type="date" value-format="yyyy-MM-dd"
-                placeholder="选择日期">
-              </el-date-picker>
+            <el-form-item :label="'Sequence No'">
+              <el-input v-model="seqNoData.sequenceNo"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item>
-              <el-button type="primary" @click="searchSOSRouting()" style="margin-top: 5px" class="">查询</el-button>
-
+              <el-button type="primary" @click="searchSOSRouting()" style="margin-top: 5px" class=""
+                :loading="seqNoModalLoading">添加</el-button>
+              <el-button type="danger" @click="deleteSeqNoByOrderNo()" style="margin-top: 5px" class="">删除</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -161,18 +152,17 @@
           :align="item.align" :fixed="item.fixed==''?false:item.fixed" :min-width="item.columnWidth"
           :label="item.columnLabel">
           <template slot-scope="scope">
-            <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+            <div v-if="item.columnProp === 'applyQty'">
+              <el-input class="applyQtyClass" v-model="scope.row.applyQty" style="height: 11px; width: 98%;"></el-input>
+            </div>
+            <span v-else-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
             <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
                 style="width: 100px; height: 80px" /></span>
           </template>
         </el-table-column>
-        <el-table-column fixed="left" header-align="center" align="center" width="80" label="操作">
-          <template slot-scope="scope">
-            <el-button type="primary" size="mini" plain class="choose-sos-btn" :loading="chooseLoading"  @click="chooseSOS(scope.row)">选择</el-button>
-          </template>
-        </el-table-column>
       </el-table>
       <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="saveNewUnissueMaterial" :loading="saveNewLoading">保存</el-button>
         <el-button type="primary" @click="seqNoModalFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
@@ -198,7 +188,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="'物料名称'">
-              <el-input v-model="notifyOrderData.partDesc" disabled style="width: 204%" ></el-input>
+              <el-input v-model="notifyOrderData.partDesc" disabled style="width: 204%"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -212,7 +202,8 @@
           </el-col>
           <el-col :span="6">
             <el-form-item :label="'此次退料数量'">
-              <el-input v-model="notifyOrderData.unissureQty"  @input=" value=>notifyOrderData.unissureQty = value.match(/0$|^[1-9]\d*/) ? value.match(/0$|^[1-9]\d*/)[0] : ''"></el-input>
+              <el-input v-model="notifyOrderData.unissureQty"
+                @input=" value=>notifyOrderData.unissureQty = value.match(/0$|^[1-9]\d*/) ? value.match(/0$|^[1-9]\d*/)[0] : ''"></el-input>
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
@@ -278,7 +269,8 @@
             :label="item.columnLabel">
             <template slot-scope="scope">
               <div v-if="item.columnProp === 'qtyToUnissue'">
-                <el-input v-model="scope.row.qtyToUnissue" style="height: 11px; width: 98%;" :step="0" :min="0"></el-input>
+                <el-input v-model="scope.row.qtyToUnissue" style="height: 11px; width: 98%;" :step="0"
+                  :min="0"></el-input>
               </div>
               <div v-else-if="item.columnProp === 'remark'">
                 <el-input v-model="scope.row.remark" style="padding: 0;width: 100%"></el-input>
@@ -468,7 +460,8 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="备注" class="issueNotify">
-              <el-input type="textarea" v-model="selectedNotifyRemark" :rows="3" placeholder="请输入内容" style="width: 100%"></el-input>
+              <el-input type="textarea" v-model="selectedNotifyRemark" :rows="3" placeholder="请输入内容"
+                style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -478,6 +471,35 @@
         <el-button type="primary" @click="showAddNotifyTypeDialog=false">取消</el-button>
       </el-footer>
     </el-dialog>
+    <el-dialog title="下达申请单" :close-on-click-modal="false" v-drag :visible.sync="showXiadaNotifyDialog"
+      width="400px">
+      <el-form :inline="true" label-position="top" label-width="500px" style="margin-left: 7px;margin-top: -5px;">
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="要求发料时间">
+              <el-date-picker
+                v-model="xiadaNotifyData.planIssueDate"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                format="yyyy-MM-dd HH:mm:ss"
+                placeholder="选择日期时间"
+                style="width: 100%">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" class="issueNotify">
+              <el-input type="textarea" v-model="xiadaNotifyData.remark" :rows="3" placeholder="请输入内容"
+                style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-footer style="height:30px;text-align:center;">
+        <el-button type="primary" @click="confirmXiadaNotify()">下达</el-button>
+        <el-button type="primary" @click="showXiadaNotifyDialog=false">取消</el-button>
+      </el-footer>
+    </el-dialog>
     <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
   </div>
 </template>
@@ -497,6 +519,8 @@ import {
   getIFSShopOrderByOrderNo,
   searchUnissueNotifyMaterialList,
   updateNotifyStatus,
+  getUnissueShopOrderAndMaterialByShoporder,
+  saveNewUnissueNotifyOrderList,
 } from '@/api/orderIssure/productionInboundRequest.js'
 import Chooselist from '@/views/modules/common/Chooselist_eam'
 
@@ -578,6 +602,9 @@ export default {
       },
       seqNoData: {
         site: this.$store.state.user.site,
+        orderNo: '',
+        releaseNo: '',
+        sequenceNo: '',
         seqno: '',
         sResourceID: '',
         sWorkcenterno: '',
@@ -600,6 +627,8 @@ export default {
       saveSeqNoModalFlag: false,
       bomLoadFlag: false,
       xiadaList: [],
+      seqNoModalLoading: false,
+      saveNewLoading: false,
       columnList4: [
         {
           userId: this.$store.state.user.name,
@@ -785,7 +814,7 @@ export default {
           columnProp: 'needDate',
           headerAlign: 'center',
           align: 'left',
-          columnLabel: '退料时间',
+          columnLabel: '创建时间',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -794,7 +823,7 @@ export default {
           fixed: '',
           columnWidth: 80,
         },
-        {
+        /* {
           userId: this.$store.state.user.name,
           functionId: 701001,
           serialNumber: '701001Table1IssureQty',
@@ -811,262 +840,336 @@ export default {
           status: true,
           fixed: '',
           columnWidth: 80,
-        },
+        }, */
       ],
       columnList2: [
         {
           userId: this.$store.state.user.name,
           functionId: 701001,
-          serialNumber: '701001Table2Orderno',
+          serialNumber: '701001Table2OrderNo',
           tableId: '701001Table2',
-          tableName: '查询派工单',
+          tableName: '查询工单及物料',
           columnProp: 'orderNo',
           headerAlign: 'center',
           align: 'center',
-          columnLabel: '生产订单',
+          columnLabel: 'OrderNo',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
-          fixed: '',
-          columnWidth: 120,
+          fixed: false,
+          columnWidth: 100,
         },
         /* {
           userId: this.$store.state.user.name,
           functionId: 701001,
-          serialNumber: '701001Table2Itemno',
+          serialNumber: '701001Table2ReleaseNo',
           tableId: '701001Table2',
-          tableName: '查询派工单',
-          columnProp: 'itemNo',
+          tableName: '查询工单及物料',
+          columnProp: 'releaseNo',
           headerAlign: 'center',
-          align: 'right',
-          columnLabel: '工序',
+          align: 'center',
+          columnLabel: 'ReleaseNo',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
-          fixed: '',
-          columnWidth: 50,
+          fixed: false,
+          columnWidth: 100,
         },
         {
           userId: this.$store.state.user.name,
           functionId: 701001,
-          serialNumber: '701001Table2ItemDesc',
+          serialNumber: '701001Table2SequenceNo',
           tableId: '701001Table2',
-          tableName: '查询派工单',
-          columnProp: 'itemDesc',
+          tableName: '查询工单及物料',
+          columnProp: 'sequenceNo',
           headerAlign: 'center',
-          align: 'left',
-          columnLabel: '工序名称',
+          align: 'center',
+          columnLabel: 'SequenceNo',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
-          fixed: '',
+          fixed: false,
+          columnWidth: 80,
+        }, */
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table2LineItemNo',
+          tableId: '701001Table2',
+          tableName: '查询工单及物料',
+          columnProp: 'lineItemNo',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '行号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 70,
+        },
+        /* {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table2Contract',
+          tableId: '701001Table2',
+          tableName: '查询工单及物料',
+          columnProp: 'contract',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '合同',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
           columnWidth: 100,
         }, */
         {
           userId: this.$store.state.user.name,
           functionId: 701001,
-          serialNumber: '701001Table2PartNo',
+          serialNumber: '701001Table2MaterialLineStatus',
           tableId: '701001Table2',
-          tableName: '查询派工单',
-          columnProp: 'partNo',
+          tableName: '查询工单及物料',
+          columnProp: 'materialLineStatus',
           headerAlign: 'center',
           align: 'left',
-          columnLabel: '物料编码',
+          columnLabel: '物料行状态',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
-          fixed: '',
-          columnWidth: 80,
+          fixed: false,
+          columnWidth: 100,
         },
         {
           userId: this.$store.state.user.name,
           functionId: 701001,
-          serialNumber: '701001Table2PartNo',
+          serialNumber: '701001Table2ComponentPartNo',
           tableId: '701001Table2',
-          tableName: '查询派工单',
-          columnProp: 'partDesc',
+          tableName: '查询工单及物料',
+          columnProp: 'componentPartNo',
           headerAlign: 'center',
           align: 'left',
-          columnLabel: '物料名称',
+          columnLabel: '物料号',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
-          fixed: '',
+          fixed: false,
           columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table2ComponentPartDesc',
+          tableId: '701001Table2',
+          tableName: '查询工单及物料',
+          columnProp: 'componentPartDesc',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '物料描述',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 180,
           showOverflowTooltip: true,
         },
         {
           userId: this.$store.state.user.name,
           functionId: 701001,
-          serialNumber: '701001Table2Qtyrequired',
+          serialNumber: '701001Table2ApplyQty',
           tableId: '701001Table2',
-          tableName: '查询派工单',
-          columnProp: 'lotSize',
+          tableName: '查询工单及物料',
+          columnProp: 'applyQty',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '工单数量',
+          columnLabel: '本次申请数量',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
-          fixed: '',
-          columnWidth: 80,
+          fixed: false,
+          columnWidth: 100,
         },
+
         {
           userId: this.$store.state.user.name,
           functionId: 701001,
-          serialNumber: '701001Table2Qtyreported',
+          serialNumber: '701001Table2QtyIssued',
           tableId: '701001Table2',
-          tableName: '查询派工单',
-          columnProp: 'qtyReported',
+          tableName: '查询工单及物料',
+          columnProp: 'qtyIssued',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '报工数量',
+          columnLabel: '已发数量',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
-          fixed: '',
-          columnWidth: 80,
+          fixed: false,
+          columnWidth: 100,
         },
         {
           userId: this.$store.state.user.name,
           functionId: 701001,
-          serialNumber: '701001Table2SScheduleddate',
+          serialNumber: '701001Table2QtyRequired',
           tableId: '701001Table2',
-          tableName: '查询工单',
-          columnProp: 'startDate',
+          tableName: '查询工单及物料',
+          columnProp: 'qtyRequired',
           headerAlign: 'center',
-          align: 'left',
-          columnLabel: '工单开始日期',
+          align: 'right',
+          columnLabel: '需求数量',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
-          fixed: '',
+          fixed: false,
           columnWidth: 100,
         },
         {
           userId: this.$store.state.user.name,
           functionId: 701001,
-          serialNumber: '701001Table2SScheduleddate',
+          serialNumber: '701001Table2QtyReserved',
           tableId: '701001Table2',
-          tableName: '查询工单',
-          columnProp: 'finishDate',
+          tableName: '查询工单及物料',
+          columnProp: 'qtyReserved',
           headerAlign: 'center',
-          align: 'left',
-          columnLabel: '工单结束日期',
+          align: 'right',
+          columnLabel: '预留数量',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
-          fixed: '',
+          fixed: false,
           columnWidth: 100,
         },
-       /*  {
+        {
           userId: this.$store.state.user.name,
           functionId: 701001,
-          serialNumber: '701001Table2SWorkcenterno',
+          serialNumber: '701001Table2Uom',
           tableId: '701001Table2',
-          tableName: '查询派工单',
-          columnProp: 'sWorkCenterNo',
+          tableName: '查询工单及物料',
+          columnProp: 'uom',
           headerAlign: 'center',
-          align: 'left',
-          columnLabel: '加工中心编码',
+          align: 'center',
+          columnLabel: '单位',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
-          fixed: '',
+          fixed: false,
           columnWidth: 80,
         },
         {
           userId: this.$store.state.user.name,
           functionId: 701001,
-          serialNumber: '701001Table2WorkCenterDesc',
+          serialNumber: '701001Table2PartNo',
           tableId: '701001Table2',
-          tableName: '查询工单',
-          columnProp: 'workCenterDesc',
+          tableName: '查询工单及物料',
+          columnProp: 'partNo',
           headerAlign: 'center',
-          align: 'left',
-          columnLabel: '加工中心名称',
+          align: 'center',
+          columnLabel: '产品编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
-          fixed: '',
-          columnWidth: 100,
+          fixed: false,
+          columnWidth: 120,
         },
         {
           userId: this.$store.state.user.name,
           functionId: 701001,
-          serialNumber: '701001Table2SResourceid',
+          serialNumber: '701001Table2PartDesc',
           tableId: '701001Table2',
-          tableName: '查询派工单',
-          columnProp: 'sResourceID',
+          tableName: '查询工单及物料',
+          columnProp: 'partDesc',
           headerAlign: 'center',
           align: 'left',
-          columnLabel: '机台编码',
+          columnLabel: '产品名称',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
-          fixed: '',
-          columnWidth: 60,
+          fixed: false,
+          columnWidth: 180,
+          showOverflowTooltip: true,
         },
         {
           userId: this.$store.state.user.name,
           functionId: 701001,
-          serialNumber: '701001Table2ResourceDesc',
+          serialNumber: '701001Table2StartDate',
           tableId: '701001Table2',
-          tableName: '查询派工单',
-          columnProp: 'resourceDesc',
+          tableName: '查询工单及物料',
+          columnProp: 'startDate',
           headerAlign: 'center',
-          align: 'left',
-          columnLabel: '机台名称',
+          align: 'center',
+          columnLabel: '开始日期',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
-          fixed: '',
-          columnWidth: 100,
+          fixed: false,
+          columnWidth: 110,
         },
         {
           userId: this.$store.state.user.name,
           functionId: 701001,
-          serialNumber: '701001Table2OperatorDesc',
+          serialNumber: '701001Table2FinishDate',
           tableId: '701001Table2',
-          tableName: '查询派工单',
-          columnProp: 'operatorDesc',
+          tableName: '查询工单及物料',
+          columnProp: 'finishDate',
           headerAlign: 'center',
-          align: 'left',
-          columnLabel: '操作员',
+          align: 'center',
+          columnLabel: '完成日期',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
-          fixed: '',
-          columnWidth: 100,
-        },*/
+          fixed: false,
+          columnWidth: 110,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table2NeedDate',
+          tableId: '701001Table2',
+          tableName: '查询工单及物料',
+          columnProp: 'needDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '需求日期',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 110,
+        },
       ],
       columnList3: [
         {
@@ -1081,7 +1184,7 @@ export default {
           columnLabel: '物料编码',
           columnHidden: false,
           columnImage: false,
-          columnSortable: false,
+          columnSortable: true,
           sortLv: 0,
           status: true,
           fixed: '',
@@ -1255,8 +1358,13 @@ export default {
       },
       showAddNotifyTypeDialog: false,
       selectedNotifyType: 'production',
-      selectedNotifyRemark:'',
+      selectedNotifyRemark: '',
       chooseLoading: false,
+      showXiadaNotifyDialog: false,
+      xiadaNotifyData: {
+        planIssueDate: '',
+        remark: '',
+      },
     }
   },
 
@@ -1510,7 +1618,7 @@ export default {
         //这边是有个判断的，判断派工单号不能重复
         let stop = false
         for (let i = 0; i < this.dataList.length; i++) {
-          if (this.dataList[i].seqNo == row.seqno) {
+          if (this.dataList[i].soorderNo == row.orderNo) {
             stop = true
           }
         }
@@ -1526,9 +1634,10 @@ export default {
         orderNo: row.orderNo,
       }
       this.chooseLoading = true
-      getIFSShopOrderByOrderNo(inData).then(({ data }) => {
+      getIFSShopOrderByOrderNo(inData)
+        .then(({ data }) => {
           if (data.code === 0) {
-          console.log("data",data);
+            console.log('data', data)
             this.notifyOrderData.partNo = data.shopOrderVo[0].partNo
             this.notifyOrderData.orderNo = data.shopOrderVo[0].orderNo
             this.notifyOrderData.itemNo = data.shopOrderVo[0].itemNo
@@ -1537,18 +1646,18 @@ export default {
             this.notifyOrderData.qtyRequired = data.shopOrderVo[0].lotSize
             this.notifyOrderData.sResourceID = row.sResourceID
             this.notifyOrderData.unissureQty = ''
-          this.notifyOrderData.needDate = this.dayjs().format('YYYY-MM-DD HH:mm')
+            this.notifyOrderData.needDate =
+              this.dayjs().format('YYYY-MM-DD HH:mm')
             this.notifyOrderData.locationNo = row.sResourceID
             this.saveSeqNoModalFlag = true
-        }else {
+          } else {
             this.$meassage.error(data.msg)
-          return;
+            return
           }
-      }).finally(() => {
+        })
+        .finally(() => {
           this.chooseLoading = false
         })
-      
-      
     },
     saveSOS() {
       if (
@@ -1571,11 +1680,11 @@ export default {
         return false
       }
       let row = this.notifyOrderData
-      console.log("row",row);
+      console.log('row', row)
       if (this.dataList.length > 0) {
         let stop = false
         for (let i = 0; i < this.dataList.length; i++) {
-          if (this.dataList[i].seqNo == row.seqno) {
+          if (this.dataList[i].soorderNo == row.orderNo) {
             stop = true
           }
         }
@@ -1636,20 +1745,22 @@ export default {
       this.searchUnissueNotifyMaterialList(rows)
       //this.enterSOS(rows)
     },
-    searchUnissueNotifyMaterialList(row){
+    searchUnissueNotifyMaterialList(row) {
       this.bomLoadFlag = true
       this.materialModalFlag = true
-      searchUnissueNotifyMaterialList(row).then(({ data }) => {
+      searchUnissueNotifyMaterialList(row)
+        .then(({ data }) => {
           if (data.code === 0) {
             this.sobomList = data.rows
           }
-      }).finally(() => {
+        })
+        .finally(() => {
           this.bomLoadFlag = false
         })
     },
 
     enterSOS(row) {
-      console.log("row",row);
+      console.log('row', row)
 
       this.seqNoModalFlag = false
       this.materialModalFlag = true
@@ -1685,7 +1796,9 @@ export default {
     chooseSOSModal() {
       this.seqNoData = {
         site: this.$store.state.user.site,
-        orderno: '',
+        orderNo: '',
+        releaseNo: '*',
+        sequenceNo: '*',
         seqno: '',
         sResourceid: '',
         sWorkcenterno: '',
@@ -1694,18 +1807,150 @@ export default {
         startDate: this.dayjs().format('YYYY-MM-DD'),
         endDate: this.dayjs().format('YYYY-MM-DD'),
       }
-      //this.searchSOSRouting()查询工单列表
+      this.seqNoList = []
       this.seqNoModalFlag = true
     },
     searchSOSRouting() {
-      getSOScheduledRoutingListForUnissure(this.seqNoData).then(({ data }) => {
+      if (this.seqNoData.orderNo == null || this.seqNoData.orderNo == '') {
+        this.$message.warning('请输入OrderNo！')
+        return false
+      }
+      if (this.seqNoData.releaseNo == null || this.seqNoData.releaseNo == '') {
+        this.$message.warning('请输入ReleaseNo！')
+        return false
+      }
+      if (
+        this.seqNoData.sequenceNo == null ||
+        this.seqNoData.sequenceNo == ''
+      ) {
+        this.$message.warning('请输入SequenceNo！')
+        return false
+      }
+      if (!this.seqNoList) {
+        this.seqNoList = []
+      }
+      const orderNoExists = this.seqNoList.some(
+        (row) => row.orderNo === this.seqNoData.orderNo
+      )
+      if (orderNoExists) {
+        this.$message.warning('该OrderNo的数据已存在，请先删除再添加！')
+        return false
+      }
+      const dataListExists = this.dataList.some(
+        (row) => row.soorderNo === this.seqNoData.orderNo
+      )
+      if (dataListExists) {
+        this.$message.warning('该OrderNo的数据已添加过，请先删除再添加！')
+        return false
+      }
+      this.seqNoModalLoading = true
+      getUnissueShopOrderAndMaterialByShoporder(this.seqNoData)
+        .then(({ data }) => {
           if (data.code === 0) {
-          this.seqNoList = data.rows
+            if (!data.rows || data.rows.length === 0) {
+              this.$message.warning('未查询到数据！')
+              return
+            }
+            data.rows.forEach((newRow) => {
+              const qtyRequired = parseFloat(newRow.qtyRequired) || 0
+              const qtyIssued = parseFloat(newRow.qtyIssued) || 0
+              const qtyReserved = parseFloat(newRow.qtyReserved) || 0
+              const applyQty = qtyIssued
+              this.$set(newRow, 'applyQty', applyQty > 0 ? applyQty : 0)
+              // 为退料保存准备字段
+              this.$set(newRow, 'qtyToUnissue', 0)
+              this.seqNoList.push(newRow)
+            })
+            this.$message.success(`成功添加 ${data.rows.length} 条数据`)
+          } else {
+            this.$message.error(data.msg)
           }
         })
+        .catch((e) => {
+          this.$message.error(e.msg || '查询失败')
+        })
+        .finally(() => {
+          this.seqNoModalLoading = false
+        })
     },
-    saveMaterialDetail() {
+    saveNewUnissueMaterial() {
+      for (let i = 0; i < this.seqNoList.length; i++) {
         
+        const v = parseFloat(this.seqNoList[i].applyQty)
+        if (
+          v &&
+          this.seqNoList[i].qtyReserved &&
+          this.seqNoList[i].qtyReserved > 0
+        ) {
+          this.$message.warning(
+            '第'+(i+1)+'行，存在预留数量，不能进行退料操作，请先取消预留！'
+          )
+          return false;
+        }
+        this.seqNoList[i].qtyToUnissue = isNaN(v) ? 0 : v
+        this.seqNoList[i].notifyNo = this.notifyNo
+        this.seqNoList[i].site = this.$store.state.user.site
+        this.seqNoList[i].bomItemNo =
+          this.seqNoList[i].lineItemNo || this.seqNoList[i].bomItemNo
+      }
+      let materialList = this.seqNoList.filter((item) => item.qtyToUnissue > 0)
+      if (materialList.length == 0) {
+        this.$alert('没有需要保存的内容!', '提示', {
+          confirmButtonText: '确定',
+        })
+        return false
+      }
+      var savaNotify = {
+        site: this.$store.state.user.site,
+        notifyNo: this.notifyNo,
+        userName: this.$store.state.user.name,
+        materialList: materialList,
+      }
+      this.saveNewLoading = true
+      saveNewUnissueNotifyOrderList(savaNotify)
+        .then(({ data }) => {
+          if (data.code === 0) {
+            this.seqNoModalFlag = false
+            this.getNotifyNoDetail()
+            this.$message.success('操作成功')
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定',
+            })
+          }
+        })
+        .finally(() => {
+          this.saveNewLoading = false
+        })
+    },
+    deleteSeqNoByOrderNo() {
+      if (this.seqNoData.orderNo == null || this.seqNoData.orderNo == '') {
+        this.$message.warning('请输入OrderNo！')
+        return false
+      }
+      if (this.seqNoList.length === 0) {
+        this.$message.warning('没有可删除的数据！')
+        return false
+      }
+      // 统计要删除的行数
+      const deleteCount = this.seqNoList.filter(row => row.orderNo === this.seqNoData.orderNo).length
+      if (deleteCount === 0) {
+        this.$message.warning('未找到匹配的OrderNo数据！')
+        return false
+      }
+      this.$confirm(`确定要删除OrderNo为 ${this.seqNoData.orderNo} 的 ${deleteCount} 条数据吗？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        // 删除所有匹配的orderNo行
+        this.seqNoList = this.seqNoList.filter(row => row.orderNo !== this.seqNoData.orderNo)
+        this.$message.success(`成功删除 ${deleteCount} 条数据`)
+      }).catch(() => {
+        // 用户取消删除
+      })
+    },
+    saveMaterialDetail() {
       for (let i = 0; i < this.sobomList.length; i++) {
         if (
           this.sobomList[i].applyQty === '' ||
@@ -1715,7 +1960,8 @@ export default {
         }
         this.sobomList[i].notifyNo = this.notifyNo
         this.sobomList[i].site = this.$store.state.user.site
-        this.sobomList[i].bomItemNo = this.sobomList[i].lineItemNo || this.sobomList[i].bomItemNo
+        this.sobomList[i].bomItemNo =
+          this.sobomList[i].lineItemNo || this.sobomList[i].bomItemNo
       }
 
       let materialList = this.sobomList.filter((item) => item.qtyToUnissue > 0)
@@ -1725,11 +1971,10 @@ export default {
         })
         return false
       }
-      console.log("this.sobomList",materialList);
+      console.log('this.sobomList', materialList)
       saveUnissueMaterialDetail(materialList).then(({ data }) => {
         if (data.code === 0) {
           this.materialModalFlag = false
-          this.chooseSOSModal()
           this.$message.success('操作成功')
         } else {
           this.$alert(data.msg, '错误', {
@@ -1857,6 +2102,23 @@ export default {
       })
     },
     xiadaNotifyModel() {
+      if (
+        this.dataList.length == 0 
+      ) {
+        this.$alert('没有明细记录无法下达！!', '提示', {
+          confirmButtonText: '确定',
+        })
+        return false
+      }
+      // 初始化弹框数据
+      this.xiadaNotifyData = {
+        planIssueDate: this.notifyData.planIssueDate || this.dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        remark: this.notifyData.remark || '',
+      }
+      // 打开弹框
+      this.showXiadaNotifyDialog = true
+    },
+    confirmXiadaNotify() {
       if (
         this.dataList.length == 0 &&
         this.dataList2.length == 0 &&
@@ -1867,30 +2129,21 @@ export default {
         })
         return false
       }
-      this.$confirm('确定下达' + '?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() => {
-        updateNotifyStatus(this.notifyData).then(({ data }) => {
-          if (data.code === 0) {
-            this.$message.success('下达成功')
-            this.getUserNotifyNo()
+      // 验证要求发料时间
+      if (!this.xiadaNotifyData.planIssueDate || this.xiadaNotifyData.planIssueDate === '') {
+        this.$message.warning('请选择要求发料时间！')
+        return false
       }
-        }).catch(() => {
-          this.$message.error(data.msg)
-        })
-      })
-      /* checkPartStock(this.notifyData).then(({ data }) => {
-        if (data.code === 0) {
-          this.xiadaList = data.rows
+      // 准备下达数据
+      const notifyData = {
+        ...this.notifyData,
+        planIssueDate: this.xiadaNotifyData.planIssueDate,
+        remark: this.xiadaNotifyData.remark,
       }
-      }) */
-      //this.xiadaModelFlag = true
-    },
-    xiadaNotify() {
-      xiadaNotify(this.notifyData).then(({ data }) => {
+      // 执行下达操作
+      updateNotifyStatus(notifyData).then(({ data }) => {
         if (data.code === 0) {
+          this.showXiadaNotifyDialog = false
           this.xiadaModelFlag = false
           this.getUserNotifyNo()
           this.$message.success('操作成功')
@@ -1957,13 +2210,9 @@ export default {
     },
     updateBuModel() {
       if (this.dataList.length > 0) {
-        this.$alert(
-          '已经选择了工单，无法切换BU，请删除已选工单！',
-          '错误',
-          {
+        this.$alert('已经选择了工单，无法切换BU，请删除已选工单！', '错误', {
           confirmButtonText: '确定',
-          }
-        )
+        })
       }
       let inData = {
         site: this.notifyData.site,
@@ -2132,7 +2381,6 @@ export default {
 }
 </script>
 <style scoped>
-
 .board666 .el-table .error-row {
   background: #f86868;
 }
@@ -2166,6 +2414,9 @@ export default {
   font-size: 12px;
   height: 20px;
 }
+.applyQtyClass /deep/.el-input__inner {
+  height: 14px !important;
+}
 </style>
 <style scoped>
 /* 选择工单弹窗：紧凑表格与按钮样式 */