fix：手动推中鼎，出库单据页面改为出库数量

opt:出库单打印

nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/purchase/controller/PurchaseController.java

@@ -7,10 +7,12 @@ import org.nl.common.logging.annotation.Log;
 import org.nl.wms.ext_manage.purchase.service.dto.BillChangeDto;
 import org.nl.wms.ext_manage.service.WmsToZDWmdService;
 import org.nl.wms.pm_manage.purchase.service.PurchaseService;
+import org.nl.wms.pm_manage.purchase.service.dao.Purchasemst;
 import org.nl.wms.pm_manage.purchase.service.dto.PurchaseDto;
+import org.nl.wms.pm_manage.purchase.service.enums.PurchaseBillStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;import org.nl.common.base.ResponseData;
+import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -79,7 +81,11 @@ public class PurchaseController {
     @PostMapping("/pushZD")
     @Log("出入库单推中鼎")
     public ResponseEntity pushZD(@RequestBody BillChangeDto billChangeDto){
-        return wmsToZDWmdService.syncPurchaseReceiving(billChangeDto);
+        wmsToZDWmdService.syncPurchaseReceiving(billChangeDto);
+        purchaseService.lambdaUpdate()
+                .set(Purchasemst::getBill_status, PurchaseBillStatus.COMPLETED.getCode())
+                .eq(Purchasemst::getBill_id, billChangeDto.getBillid());
+        return ResponseData.build();
     }
     @PostMapping("/outPush")
     @Log("下推出库单")

nladmin-ui/src/views/wms/pm_manage/allocationIn/index.vue

@@ -243,6 +243,9 @@ export default {
         orderType: row.order_type,
         red: row.red,
         status: row.status
+      }).then(res => {
+        this.crud.notify(res.respMsg)
+        this.crud.init()
       })
     }, toView(index, row) {
       this.mstrow = row

nladmin-ui/src/views/wms/pm_manage/allocationOut/index.vue

@@ -51,7 +51,7 @@
         </el-table-column>
         <el-table-column label="明细数" align="center" prop="dtl_count" width="80" />
         <el-table-column label="单据总数" align="center" prop="total_qty" width="80" />
-        <el-table-column label="入库数量" align="center" prop="instock_qty" width="80" />
+        <el-table-column label="出库数量" align="center" prop="instock_qty" width="80" />
         <el-table-column label="转发中鼎" align="center" prop="forwardZD" width="80">
           <template slot-scope="scope">
             <p v-if="scope.row.forwardZD == '0'">-</p>
@@ -198,6 +198,9 @@ export default {
         orderType: row.order_type,
         red: row.red,
         status: row.status
+      }).then(res => {
+        this.crud.notify(res.respMsg)
+        this.crud.init()
       })
     },
     toView(index, row) {

nladmin-ui/src/views/wms/pm_manage/otherIn/index.vue

@@ -181,6 +181,9 @@ export default {
         orderType: row.order_type,
         red: row.red,
         status: row.status
+      }).then(res => {
+        this.crud.notify(res.respMsg)
+        this.crud.init()
       })
     },
     toView(index, row) {

nladmin-ui/src/views/wms/pm_manage/otherOut/index.vue

@@ -51,7 +51,7 @@
         </el-table-column>
         <el-table-column label="明细数" align="center" prop="dtl_count" width="80" />
         <el-table-column label="单据总数" align="center" prop="total_qty" width="80" />
-        <el-table-column label="入库数量" align="center" prop="instock_qty" width="80" />
+        <el-table-column label="出库数量" align="center" prop="instock_qty" width="80" />
         <el-table-column label="转发中鼎" align="center" prop="forwardZD" width="80">
           <template slot-scope="scope">
             <p v-if="scope.row.forwardZD == '0'">-</p>
@@ -170,6 +170,9 @@ export default {
         orderType: row.order_type,
         red: row.red,
         status: row.status
+      }).then(res => {
+        this.crud.notify(res.respMsg)
+        this.crud.init()
       })
     },
     toView(index, row) {

nladmin-ui/src/views/wms/pm_manage/returnIn/index.vue

@@ -181,6 +181,9 @@ export default {
         orderType: row.order_type,
         red: row.red,
         status: row.status
+      }).then(res => {
+        this.crud.notify(res.respMsg)
+        this.crud.init()
       })
     },
     toView(index, row) {

nladmin-ui/src/views/wms/pm_manage/saleOut/index.vue

@@ -51,7 +51,7 @@
         </el-table-column>
         <el-table-column label="明细数" align="center" prop="dtl_count" width="80" />
         <el-table-column label="单据总数" align="center" prop="total_qty" width="80" />
-        <el-table-column label="入库数量" align="center" prop="instock_qty" width="80" />
+        <el-table-column label="出库数量" align="center" prop="instock_qty" width="80" />
         <el-table-column label="转发中鼎" align="center" prop="forwardZD" width="80">
           <template slot-scope="scope">
             <p v-if="scope.row.forwardZD == '0'">-</p>
@@ -170,6 +170,9 @@ export default {
         orderType: row.order_type,
         red: row.red,
         status: row.status
+      }).then(res => {
+        this.crud.notify(res.respMsg)
+        this.crud.init()
       })
     },
     toView(index, row) {

nladmin-ui/src/views/wms/st/outbill/index.vue

@@ -191,7 +191,8 @@
             />
           </template>
         </el-table-column>
-        <el-table-column :selectable="checkboxT" type="selection" width="55" />
+        <!--        <el-table-column :selectable="checkboxT" type="selection" width="55" />-->
+        <el-table-column type="selection" width="55" />
         <el-table-column show-overflow-tooltip prop="bill_code" width="130" label="单据号">
           <template slot-scope="scope">
             <el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.bill_code }}</el-link>