出入库的生成

package-inventory/pages/other-outbound/other-outbound.js

@@ -466,37 +466,40 @@ Page({
         let formData = JSON.parse(this.data.formData)
         // 新增编辑的
         params.outId = formData.outId
+        if (this.data.flgHandleSetting) {
+            params.flgAutoHandle = true
+        } else {
+            params.flgAutoHandle = btnFormData ? btnFormData.flag : false //自动出入库标识 
+        }
         // 总单的 出库中数量和金额合计
-
-      
-
         if (formData.outStatus == Constants.outStatus.outBounded) { //已出库
             params.outingAmt = 0  //金额
             params.outingQty = 0 //一共的商品数量
             params.outAmt = formData.goodsList.sum("outAmt") //  已出库金额
             params.outQty = formData.goodsList.sum("outQty") //  已出库数量   
-            formData.goodsList.forEach(item=>{
+            formData.goodsList.forEach(item => {
                 item.outBox = item.box
                 item.outPiece = item.piece
-            })       
+            })
 
         } else { //出库中
             params.outingAmt = formData.goodsList.sum("outingAmt")   //金额
             params.outingQty = formData.goodsList.sum("outingQty")     //一共的商品数量
             params.outAmt = 0     //  已出库金额
             params.outQty = 0     //  已出库数量     
-            formData.goodsList.forEach(item=>{
-                item.outingBox = item.box
-                item.outingPiece = item.piece
-            })    
-        }
-
+            formData.goodsList.forEach(item => {
+                //  新建 直接生成出库单的情况
+                if (params.flgAutoHandle) {
+                    item.outBox = item.box
+                    item.outPiece = item.piece
+                } else {
+                    item.outingBox = item.box
+                    item.outingPiece = item.piece
+                }
 
-        if (this.data.flgHandleSetting) {
-            params.flgAutoHandle = true
-        } else {
-            params.flgAutoHandle = btnFormData ? btnFormData.flag : false //自动出入库标识 
-        }
+            })
+        } 
+       
         // 系统参数
         params.flgHandleSetting = this.data.flgHandleSetting
         //负库存

package-inventory/pages/other-warehousing/other-warehousing.js

@@ -277,7 +277,7 @@ Page({
                 element.piece = element.intoingPiece
             }
             if (data.intoType == Constants.intoType.saleReturn) {
-                element['intoingQty_max'] = -1 
+                element['intoingQty_max'] = -1
                 if (data.intoStatus == Constants.intoStatus.inBounded) {
                     element['intoingQty_min'] = -1 * Math.abs(element.intoQty)
                 } else {
@@ -468,32 +468,39 @@ Page({
         let formData = JSON.parse(this.data.formData)
         // 新增编辑的
         params.intoId = formData.intoId
+        if (this.data.flgHandleSetting) {
+            params.flgAutoHandle = true
+        } else {
+            params.flgAutoHandle = btnFormData ? btnFormData.flag : false //自动出入库标识 
+        }
         // 总单的 入库中数量和金额合计  
         if (formData.intoStatus == Constants.intoStatus.inBounded) { //已入库
             params.intoingAmt = 0  //金额
             params.intoingQty = 0 //一共的商品数量
             params.intoAmt = formData.goodsList.sum("intoAmt") //  已入库金额
             params.intoQty = formData.goodsList.sum("intoQty") //  已入库数量   
-            formData.goodsList.forEach(item=>{
+            formData.goodsList.forEach(item => {
                 item.intoBox = item.box
                 item.intoPiece = item.piece
-            })            
+            })
 
         } else { //入库中
             params.intoingAmt = formData.goodsList.sum("intoingAmt") //金额
             params.intoingQty = formData.goodsList.sum("intoingQty") //一共的商品数量
             params.intoAmt = 0 //  已入库金额
             params.intoQty = 0 //  已入库数量     
-            formData.goodsList.forEach(item=>{
-                item.intoingBox = item.box
-                item.intoingPiece = item.piece
-            })     
-        }
-        if (this.data.flgHandleSetting) {
-            params.flgAutoHandle = true
-        } else {
-            params.flgAutoHandle = btnFormData ? btnFormData.flag : false //自动出入库标识 
+            formData.goodsList.forEach(item => {
+                //  新建 直接生成入库单的情况
+                if (params.flgAutoHandle) {
+                    item.intoBox = item.box
+                    item.intoPiece = item.piece
+                } else {
+                    item.intoingBox = item.box
+                    item.intoingPiece = item.piece
+                }               
+            })
         }
+
         // 系统参数
         params.flgHandleSetting = this.data.flgHandleSetting
         params.orgId = formData.orgId  //组织部门