Merge branch 'dev' into 'master'

Dev

See merge request !295

src/views/order/components/FastProduction.vue

@@ -262,12 +262,7 @@
                 }}
                 }}
               </el-button>
               </el-button>
               <div class="check">
               <div class="check">
-                <el-checkbox
-                  v-if="fastKey !== 'productionScan'"
-                  v-model="isAutoSure"
-                >
-                  自动完成上一单
-                </el-checkbox>
+                <el-checkbox v-model="isAutoSure"> 自动完成上一单 </el-checkbox>
               </div>
               </div>
             </div>
             </div>
             <div v-if="fastKey !== 'fastReceipt'" class="btn-down">
             <div v-if="fastKey !== 'fastReceipt'" class="btn-down">
@@ -797,11 +792,8 @@ const trackCodeInput = async () => {
 
 
   const orderNumber = TrackingNumber.value
   const orderNumber = TrackingNumber.value
 
 
-  if (!['productionScan'].includes(props.fastKey) && isAutoSure.value) {
-    await setData(
-      historyData.value[historyData.value.length - 1].orderNumber || '',
-      'auto',
-    )
+  if (isAutoSure.value) {
+    await setData(historyKeyFromDetail(detail.value), 'manual')
   }
   }
 
 
   try {
   try {

src/views/order/factoryOrderNew/index.vue

@@ -580,7 +580,7 @@
           class="item"
           class="item"
         >
         >
           <ElButton type="success" @click="handlePrintProductionOrder"
           <ElButton type="success" @click="handlePrintProductionOrder"
-            >打印生产单</ElButton
+            >打印操作单</ElButton
           >
           >
         </span>
         </span>
         <span v-if="status === 'PENDING_PICK'" class="item">
         <span v-if="status === 'PENDING_PICK'" class="item">
@@ -607,18 +607,15 @@
             >补胚失败</ElButton
             >补胚失败</ElButton
           >
           >
         </span>
         </span>
-        <span v-if="status === 'IN_PRODUCTION' && isEnableSorting" class="item">
+        <span
+          v-if="status === 'PENDING_PACKING' && isEnableSorting"
+          class="item"
+        >
           <ElButton type="primary" @click="handleSeedingWall('sort')"
           <ElButton type="primary" @click="handleSeedingWall('sort')"
             >配货分拣</ElButton
             >配货分拣</ElButton
           >
           >
         </span>
         </span>
-        <span
-          v-if="
-            status === 'PENDING_PACKING' ||
-            (status === 'IN_PRODUCTION' && !isEnableSorting)
-          "
-          class="item"
-        >
+        <span v-if="status === 'PENDING_PACKING'" class="item">
           <ElButton type="success" @click="handleSeedingWall('print')"
           <ElButton type="success" @click="handleSeedingWall('print')"
             >配货打单</ElButton
             >配货打单</ElButton
           >
           >
@@ -1526,7 +1523,7 @@ const getListQueryPayload = () => {
 const getCraft = async () => {
 const getCraft = async () => {
   const res = await getPodOrderCraftApi()
   const res = await getPodOrderCraftApi()
   const data: CraftListData[] = res.data
   const data: CraftListData[] = res.data
-  podCraftList.value = data.map((item:CraftListData) => ({
+  podCraftList.value = data.map((item: CraftListData) => ({
     id: item.craftCode,
     id: item.craftCode,
     name: item.craftName,
     name: item.craftName,
     warehouseName: processTypeMap[item.craftType] ?? '其他',
     warehouseName: processTypeMap[item.craftType] ?? '其他',
@@ -1930,19 +1927,19 @@ const mainColumns = computed(() => [
   },
   },
   {
   {
     prop: 'statusName',
     prop: 'statusName',
-    label:'挂起前状态',
+    label: '挂起前状态',
     minWidth: 120,
     minWidth: 120,
-    hidden:status.value !== 'SUSPEND',
-    align: 'center'
+    hidden: status.value !== 'SUSPEND',
+    align: 'center',
   },
   },
   {
   {
     prop: 'statusName',
     prop: 'statusName',
-    hidden:status.value === 'SUSPEND',
+    hidden: status.value === 'SUSPEND',
     label: '订单状态',
     label: '订单状态',
     minWidth: 120,
     minWidth: 120,
     align: 'center',
     align: 'center',
     render: (row: FactoryOrderNewListData) => {
     render: (row: FactoryOrderNewListData) => {
-      return <span>{ row.pause ? '挂起' : row.statusName}</span>
+      return <span>{row.pause ? '挂起' : row.statusName}</span>
     },
     },
   },
   },
   {
   {
@@ -2927,10 +2924,7 @@ const handleSeedingWall = (type: 'print' | 'sort') => {
 /** LODOP 单例不可并发，打印串行 */
 /** LODOP 单例不可并发，打印串行 */
 let printOrderChain: Promise<void> = Promise.resolve()
 let printOrderChain: Promise<void> = Promise.resolve()
 
 
-const printOrder = (
-  data: OrderData,
-  callback: (status: boolean) => void,
-) => {
+const printOrder = (data: OrderData, callback: (status: boolean) => void) => {
   const run = async () => {
   const run = async () => {
     const lodop = getCLodop(null, null)
     const lodop = getCLodop(null, null)
     if (!lodop) {
     if (!lodop) {