组合商品

src/views/outbound/picking/list/hooks/barcodeCombine.js

@@ -3,7 +3,7 @@ export function barcodeCombine(goodsList, combineSkuMap){
   const result = goodsList.map(item => {
       const barcode = item.barcode || item.barcodeAs;
       // 如果有匹配数据，将 matchedJson 添加到 item 中
-      if (combineSkuMap[barcode] && item.expectedQuantity <= combineSkuMap[barcode].quantity ) {
+      if (combineSkuMap[barcode] && item.expectedQuantity >= combineSkuMap[barcode].quantity ) {
         return {
           ...item,
           matchedJson: combineSkuMap[barcode]

src/views/outbound/picking/list/index.vue

@@ -373,6 +373,7 @@ const _handlerScan=(code)=> {
         if(res.data.length>0){
           const combineSkuMap=toMap(res.data,'barcode')
           const matchedSkuList=barcodeCombine(modelLocative.list,combineSkuMap)
+          console.log(matchedSkuList,"matchedSkuList")
           if(matchedSkuList.length>0){
             if(matchedSkuList.length==res.data.length){
               matchedSku.value=matchedSkuList
@@ -388,7 +389,7 @@ const _handlerScan=(code)=> {
             scanError()
             showDialog({
               title:'温馨提示',
-              message:'组合商品与拣货任务匹配，请检查组合商品配置！'
+              message:'组合商品与拣货任务不匹配，请检查组合商品配置！'
             })
           }
         }else {
@@ -438,9 +439,9 @@ const jumpLoading=ref(false);
 const onCount=(item,type)=>{
   const data=JSON.parse(JSON.stringify(item))
   data.operationTime=formatDateTime(new Date())
+  data.container=containerNo.value
   const params=[data]
   if(type==0){
-    data.container=containerNo.value
     data.quantity=data.count
   }else {
     data.quantity=0
@@ -624,7 +625,7 @@ const onRefresh = () => {
   .code
     height: 67px
     padding: 5px 10px
-    background: #f2f8fe
+    background: #e9f4ff
     box-sizing: border-box
 
     .code-title
@@ -645,7 +646,7 @@ const onRefresh = () => {
     .code-input
       font-size: 16px
       font-weight: bold
-      background: #f2f8fe
+      background: #e9f4ff
       padding: 2px 10px
       border-bottom: 2px solid #0077ff
 
@@ -653,7 +654,7 @@ const onRefresh = () => {
     overflow: scroll
 
     .left
-      background: #f2f8fe
+      background: #e9f4ff
       padding: 2px 10px
       height: 80vh
       overflow: scroll
@@ -684,7 +685,7 @@ const onRefresh = () => {
       overflow: scroll
       box-sizing: border-box
       text-align: left
-      padding: 2px 5px
+      padding: 2px 0
       background: #fff
       .right-list
         padding: 10px

src/views/outbound/picking/task/index.vue

@@ -495,7 +495,8 @@ const onRefresh = () => {
     loading.value = false
   }, 1000)
 }
-window.onRefresh=onRefresh
+
+window.onRefresh=loadData
 
 </script>
 <style scoped lang="sass">