*

lsh

9 小时以前 24ff0501f06c17d3de8d365a7bcdd7c802367151

*

 src/main/java/com/zy/asrs/controller/OrderPakoutController.java

@@ -367,8 +367,19 @@
    @RequestMapping(value = "/actual/shipment/order/report/auth")
    @ManagerAuth(memo = "上报MES实际组货单")
    public R actualShipmentOrder(@RequestParam String itemName) {
        Long userId = getUserId();
        Long userId = null;
        try {
            userId = getUserId();
            if (Cools.isEmpty(userId)) {
                return R.error("用户异常").add("用户异常");
            }
        } catch (Exception e){
            return R.error("用户异常").add("用户异常");
        }
        List<OrderPakoutDetailVo> OrderPakoutDetailVoList = orderDetlService.selectOrderPakoutDetailVoListV1(itemName);
        if (OrderPakoutDetailVoList.isEmpty()) {
            return R.error("上报明细为空！！！").add("上报明细为空！！！");
        }
        List<String> boxList = new ArrayList<>();
        List<String> rollList = new ArrayList<>();
        for (OrderPakoutDetailVo orderDetl : OrderPakoutDetailVoList){

 src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html

@@ -261,7 +261,8 @@
                    class="confirm-report-btn"
                    @click="showConfirmDialog"
                    :loading="reportLoading">
                确认上报
                <!-- 直接在模板中判断 -->
                {{ settleA === 17 ? '再次上报' :  '确认上报' }}
            </el-button>
            <el-button @click="closeDetailDialog">关闭</el-button>
        </div>
@@ -295,6 +296,7 @@
            currentRow: null,
            // 子表分页
            detailCurrentPage: 1,
            settleA: 1,
            detailPageSize: 5,
            detailTotal: 0,
            // 加载状态
@@ -640,6 +642,7 @@
                this.currentRow = row;
                this.detailDialogVisible = true;
                this.detailCurrentPage = 1;
                this.settleA = row.settle;
                this.getTableDataB(row.itemName);
            },