生产管理

src/api/yunyin/yunying.js

@@ -515,6 +515,14 @@ export const ProcessDetailDel  = (params) => {
         params
     })
 }
+//工艺资料添加->工序损耗代码
+export const WastageList  = (params) => {
+    return service({
+        url: '/mes_server/work_order/WastageList',
+        method: 'get',
+        params
+    })
+}
 
 /**工单生产排单(排产管理)*/
 //计划中工单

src/view/yunyin/shengchanguanli/components/addGongYi.vue

@@ -12,19 +12,19 @@
               <el-input v-model="form['工序']"  id="工序编号" @keydown="add_gyzlent($event, '印件编号', '工序编号', '重点工序')"  style="width: 100px;"/>
             </el-form-item>
             <el-form-item label="重点工序:"  class="mab" prop="keyOrder" label-width=" 90">
-              <el-select  v-model="form['重点工序']" id="重点工序"  @keydown="add_gyzlent($event, '', '重点工序', '开数')"  style="width: 140px;">
+              <el-select  v-model="form['重点工序']" id="重点工序"  @keydown="add_gyzlent($event, '', '重点工序', '开数')"  style="width: 130px;">
                 <el-option value=""></el-option>
                 <el-option value="重点工序">重点工序</el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="备选工序："  class="mab" prop="isBanciSelected" label-width=" 90">
+            <el-form-item label="备选工序："  class="mab" prop="isBanciSelected" label-width=" 100">
               <el-checkbox v-model="form['备选工序']"></el-checkbox>
             </el-form-item>
-            <el-form-item label="加工开数:"  class="mab" prop="keyOrder" label-width=" 125">
-              <el-input  v-model="form['开数']"  style="width: 100px;" id="开数"  @keydown="add_gyzlent($event, '重点工序  ', '开数', '联数')" />
+            <el-form-item label="加工开数:"  class="mab" prop="keyOrder" label-width=" 100">
+              <el-input  v-model="form['开数']"  style="width: 80px;" id="开数"  @keydown="add_gyzlent($event, '重点工序  ', '开数', '联数')" />
             </el-form-item>
             <el-form-item label="加工联数:"  class="mab" prop="keyOrder" label-width=" 80">
-              <el-input  v-model="form['联数']"  style="width: 100px;" id="联数"  @keydown="add_gyzlent($event, '开数', '联数', '车间名称')" />
+              <el-input  v-model="form['联数']"  style="width: 80px;" id="联数"  @keydown="add_gyzlent($event, '开数', '联数', '车间名称')" />
             </el-form-item>
           </div>
           <div style="display: flex; gap: 0px;">
@@ -93,15 +93,16 @@
       </el-form>
 
       <template #footer>
-        <div class="dialog-footer" style="text-align: right;top: auto">
+        <div class="dialog-footer" style="text-align: right;top: auto;">
           <el-button @click="add_gdgycloseDialog">取 消</el-button>
           <el-button type="primary" @click="add_gdgyenterDialog">确 定</el-button>
         </div>
       </template>
     </el-dialog>
 
-    <el-dialog v-model="yjdisplay" :before-close="()=> yjdisplay = false" style="width: 800px;margin: 8px auto" :title="'可选列表'" destroy-on-close>
-      <el-tree :data="yjList" :props="{children: 'children',label: 'name', value: 'no'}" @node-click="changeHandle" default-expand-all style="border: 1px solid #ececec; padding: 10px">
+    <el-dialog v-model="yjdisplay" :before-close="()=> yjdisplay = false" style="width: 800px;" :title="'可选列表'" destroy-on-close>
+      <el-tree :data="yjList" :props="{children: 'children',label: 'name', value: 'no'}" @node-click="changeHandle"
+               default-expand-all style="border: 1px solid #ececec; padding: 10px;height: 400px;overflow: auto;">
       </el-tree>
     </el-dialog>
 
@@ -111,23 +112,38 @@
           :render-after-expand="false"
           @node-click="selectHandle"
           :props="{children: 'children',label: 'label', value: 'value'}"
-          style="border: 1px solid #ececec; padding: 10px"
+          style="border: 1px solid #ececec; padding: 10px;height: 400px;overflow: auto;"
           node-key="value"
           :default-expanded-keys="['标准工艺']"
       >
       </el-tree>
     </el-dialog>
+
+<!--    工序损耗列表-->
+    <el-dialog v-model="gxshdisplay" :before-close="()=> gxshdisplay = false" style="width: 800px;" :title="'工序损耗'" destroy-on-close>
+      <el-tree
+          :data="gxshList"
+          :render-after-expand="false"
+          @node-click="gxshselectHandle"
+          :props="{children: 'children',label: 'label', value: 'value'}"
+          style="border: 1px solid #ececec; padding: 10px;height: 400px;overflow: auto;"
+          node-key="value"
+          :default-expanded-keys="['编号']"
+      >
+      </el-tree>
+    </el-dialog>
   </div>
 </template>
 
 <script setup>
 import {ref, reactive} from 'vue'
-import {gdzl_MachineList, PrintDetailList, getDepartName, capacityList} from "@/api/yunyin/yunying";
+import {gdzl_MachineList, PrintDetailList, WastageList,getDepartName, capacityList} from "@/api/yunyin/yunying";
 
 const form = reactive({})
 const visible = ref(false)
 const yjdisplay = ref(false)
 const cjdisplay = ref(false)
+const gxshdisplay = ref(false)
 const id = ref()
 
 const gxList = ref([])
@@ -143,15 +159,23 @@ const gdzl_MachineList_address = ref()
 
 //新增工艺资料弹窗 键盘 input框跳转
 const add_gyzlent = (event,id1,id2,id3) => {
-  if (id2==='印件编号' && event.key==='Tab') {
+  if (id2==='印件编号' && event.key==='Tab' || id2 === '印件编号' && event.key=== 'Enter') {
     const node = yjList.value.find(item => item.no ===form['yjno'])
     if (! node) {
       yjdisplay.value = true
     }
+    document.getElementById(id3).focus()
   }
-  if (id2 === '车间名称' && event.key==='Tab') {
+  if (id2 === '车间名称' && event.key==='Tab' || id2 === '车间名称' && event.key=== 'Enter') {
+    document.getElementById(id3).focus()
     cjdisplay.value = true
   }
+  if (id2 === '工序损耗' && event.key==='Tab' || id2 === '工序损耗' && event.key=== 'Enter') {
+    if(form['车间名称']){
+      gxshList();
+      gxshdisplay.value = true
+    }
+  }
   if (event.keyCode === 13 || event.keyCode === 40) { // Enter 或向下箭头
     if(id3!=''){
       document.getElementById(id3).focus()
@@ -193,6 +217,16 @@ const open = async (gdbh, gxlist) => {
   visible.value = true
 }
 
+//工序损耗列表
+const gxshList = async ()=>{
+  const WastageList_data = await WastageList({search: form['车间名称']})
+  console.log(WastageList_data)
+}
+//点击工序损耗列表数据
+const gxshselectHandle = async (node)=>{
+  console.log(node)
+  console.log(1232131)
+}
 const selectHandle = async (node)=>{
   if (node.children && node.children.length> 0) return
   function findParentInTree(tree, targetValue) {
@@ -201,14 +235,12 @@ const selectHandle = async (node)=>{
       if (node.value === targetValue) {
         return node;
       }
-
       // 如果当前节点有子节点，递归地在子节点中查找
       if (node.children && node.children.length > 0) {
         let parent = findParentInTree(node.children, targetValue);
         if (parent) return parent
       }
     }
-
     // 如果没有找到目标值或其上级，返回null
     return null;
   }
@@ -222,8 +254,10 @@ const selectHandle = async (node)=>{
   form['设备编号'] = []
   //通过车间名称查询机台
   const MachineList_jitai = await gdzl_MachineList({address:form['车间名称']});
-  console.log(MachineList_jitai)
   gdzl_MachineList_address.value = MachineList_jitai.data;
+  //通过车间名称查询工序损耗
+  const WastageList_data = await WastageList({search:form['车间名称']});
+  console.log(WastageList_data.data)
 
   cjdisplay.value = false
 }

src/view/yunyin/shengchanguanli/components/print.vue

@@ -2630,11 +2630,11 @@ const cp_print_handleConfirm = async () => {
   const currentDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
   const printdata  = {
     "minong": "https://shangbiaopic.11467.com/13/85/13855845.jpg",
-    "printcode":print_PrintJobOrder.data['二维码'],
+    "printcode":print_PrintJobOrder.data['生产批次号'],
     "dysj":currentDate,
     "scpch":print_PrintJobOrder.data['生产批次号'],
-    "xsddh":print_PrintJobOrder.data['生产批次号'],
-    // "xsddh":print_PrintJobOrder.data['销售订单号'],
+    // "xsddh":print_PrintJobOrder.data['生产批次号'],
+    "xsddh":print_PrintJobOrder.data['销售订单号'],
     "khdh":  print_PrintJobOrder.data['客户代码'],
     "khmc":  print_PrintJobOrder.data['客户名称'],
     "cpdm":  print_PrintJobOrder.data['产品代码'],

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -29,9 +29,9 @@
           <!--按钮弹窗部分-->
           <!--U8投料试算-->
           <el-dialog v-model="tlsslist"     title="U8投料试算"   style="height: 100%;width: 100%;margin: 0;padding: 0">
-            <!--            <el-button type="primary" icon="" disabled @click="ontlssclicks" class="bt">投料试算</el-button>-->
-            <!--            <el-button type="primary" icon="" disabled @click="onbxgxclicks" class="bt">备选工序</el-button>-->
-            <!--            <el-button type="primary" icon="" disabled @click="onsjgxclicks" class="bt">实际工序</el-button>-->
+            <el-button type="primary" icon="" disabled @click="ontlssclicks" class="bt">投料试算</el-button>
+            <el-button type="primary" icon="" disabled @click="onbxgxclicks" class="bt">备选工序</el-button>
+            <el-button type="primary" icon="" disabled @click="onsjgxclicks" class="bt">实际工序</el-button>
             <el-button type="primary" icon="" @click="oncloneclick" style="margin: 5px">退出</el-button>
             <div style="width: 100%; height: 60px; padding: 0px; margin: 10px 0px 0px 0px; display: flex; align-items: center;">
               <!-- 第一行 -->
@@ -152,7 +152,7 @@
               </el-form-item>
               <div class="dialog-footer" style="margin-top: 20px; text-align: right ">
                 <el-button @click="gxclhshandleCancel">取消</el-button>
-                <el-button type="primary"  @click="gxclhshandleConfirm">确定</el-button>
+                <el-button type="primary" disabled  @click="gxclhshandleConfirm">确定</el-button>
               </div>
             </div>
           </el-dialog>
@@ -326,68 +326,6 @@
                 </el-table-column>
               </template>
             </el-table>
-
-
-
-            <!--          <el-table ref="multipleTable"-->
-            <!--                    :show-overflow-tooltip="true"-->
-            <!--                    :row-style="{ height: '0px' }"-->
-            <!--                    :cell-style="{ padding: '0px' }" :header-row-style="{ height: '0px' }"-->
-            <!--                    :header-cell-style="{ padding: '0px' }"-->
-            <!--                    style="width: 100%;height: 70vh" border tooltip-effect="dark"-->
-            <!--                    :data="scfjfpxstableData" row-key="ID" @selection-change="handleSelectionChange">-->
-            <!--            <el-table-column v-slot="scope" align="left" label=产品编号 width="120" >-->
-            <!--              <el-input disabled  v-model="scope.row.产品编号" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column v-slot="scope" align="left" label=产品名称 width="200" >-->
-            <!--              <el-input disabled  v-model="scope.row.产品名称" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column v-slot="scope" align="left" label=印件工序及工艺 width="220" >-->
-            <!--              <el-input disabled  v-model="scope.row.印件工序及工艺" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column v-slot="scope" align="left" label=原人工正品板 width="110" >-->
-            <!--              <el-input disabled  v-model="scope.row.scfjfpxsold_人工正品板" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column v-slot="scope" align="left" label=原人工次品板 width="110" >-->
-            <!--              <el-input disabled  v-model="scope.row.scfjfpxsold_人工次品板" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column v-slot="scope" align="left" label=原人工废检 width="110" >-->
-            <!--              <el-input disabled  v-model="scope.row.scfjfpxsold_人工废检" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column v-slot="scope" align="left" label=原机检正品板 width="110" >-->
-            <!--              <el-input disabled  v-model="scope.row.scfjfpxsold_机检正品板" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column v-slot="scope" align="left" label=原机检次品板 width="110" >-->
-            <!--              <el-input disabled  v-model="scope.row.scfjfpxsold_机检次品板" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column v-slot="scope" align="left" label=原机检废检 width="110" >-->
-            <!--              <el-input disabled  v-model="scope.row.scfjfpxsold_机检废检" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column v-slot="scope" align="left" label=新人工正品板 width="110" >-->
-            <!--              <el-input   v-model="scope.row.人工正品板" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column v-slot="scope" align="left" label=新人工次品板 width="110" >-->
-            <!--              <el-input   v-model="scope.row.人工次品板" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column v-slot="scope" align="left" label=新人工废检 width="110" >-->
-            <!--              <el-input   v-model="scope.row.人工废检" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column v-slot="scope" align="left" label=新机检正品板 width="110" >-->
-            <!--              <el-input   v-model="scope.row.机检正品板" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column v-slot="scope" align="left" label=新机检次品板 width="110" >-->
-            <!--              <el-input   v-model="scope.row.机检次品板" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column v-slot="scope" align="left" label=新机检废检 width="110" >-->
-            <!--              <el-input   v-model="scope.row.机检废检" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column v-slot="scope" align="left" label=设备编号 width="100" >-->
-            <!--              <el-input disabled  v-model="scope.row.设备编号" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column v-slot="scope" align="left" label=客户名称 width="200" >-->
-            <!--              <el-input disabled  v-model="scope.row.客户名称" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--          </el-table>-->
           </el-dialog>
 
           <!--工序产量核查【弹窗】-->
@@ -409,8 +347,7 @@
                       highlight-current-row="true"
                       @row-click="gxclhc_tableRowClick"
                       :data="gxclhc_Data" row-key="ID"
-                      :cell-class-name="gxclhcCellClass"
-            >
+                      :cell-class-name="gxclhcCellClass">
               <template v-for="(item, idx) in gxclhc_Columns">
                 <el-table-column #default="{ row, column, $index }" align="left" :label="item.label" :width="item.width" >
                   {{row[item.prop]}}
@@ -486,7 +423,7 @@
                         @row-dblclick="updateCompanyFunc"
                         @selection-change="handleSelectionChange"
                         :show-overflow-tooltip="true">
-                <el-table-column align="center" type="selection" width="30"/>
+<!--                <el-table-column align="center" type="selection" width="30"/>-->
                 <el-table-column align="left" label="获取状态"   prop="status"  width="81" />
                 <el-table-column align="left" label="工单编号"   prop="工单编号"  width="81" />
                 <el-table-column align="left" label="生产分类"   prop="生产分类" width="81" />
@@ -1980,10 +1917,7 @@ const openSearchZhiModal = (code, idx) => {
 const addgdyj_onclick = () => {
   if(_Gd_gdbh.value == null){
     cgugdlist.value = false;
-    ElMessage({
-      type: 'warning',
-      message: '请选择具体的工单后，再操作此功能'
-    })
+    ElMessage({type: 'warning',message: '请选择具体的工单后，再操作此功能' })
   }else{
     gdyj_clearFormData();
     // console.log(yjzuidahaoma.value)
@@ -1993,6 +1927,18 @@ const addgdyj_onclick = () => {
 //印件新增确定
 const add_gdyjenterDialog =  async  () => {
   // console.log(add_yjzlformdata)
+  if(add_yjzlformdata['yjno'] === ''){
+    ElMessage({type: 'warning',message: '印件号不能为空'})
+    return false;
+  }
+  if(add_yjzlformdata['yjdh'] === ''){
+    ElMessage({type: 'warning',message: '印件代号不能为空'})
+    return false;
+  }
+  if(add_yjzlformdata['zzdh'] === ''){
+    ElMessage({type: 'warning',message: '纸张编号不能为空'})
+    return false;
+  }
   const formattedData = {
     Yj_Gdbh: _Gd_gdbh.value,
     yj_cpdh: _Gd_cpdh.value,