天津提示问题处理

guoyuji

2024-12-10 2a751641cf28cb8a081bd003d55e188dfb17aaa1

天津提示问题处理

 north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet3.vue

@@ -192,7 +192,7 @@
        <th colspan="5">
          <h3>销售确认单</h3>
        </th>
        <th colspan="2" style="text-align: left;font-weight: bold;">发货单号：<span>{{delivery.deliveryId}}</span></th>
        <th colspan="2" style="text-align: left;font-weight: bold;" v-if="company.showDeliveryCreator">发货单号：<span>{{delivery.deliveryId}}</span></th>
      </tr>
      <tr>
        <th style="text-align: left;border:none;font-weight: bold;" colspan="4">客户名称：<span>{{delivery.customerName}}</span></th>

 north-glass-erp/northglass-erp/src/lang/zh.js

@@ -273,6 +273,7 @@

            pleaseCancelTheFilteringFirst:'请先取消筛选',
            grossAreaIsNot0:'存在实际总面积等于0',
            differentSize:''
        }

    },

 north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue

@@ -1063,7 +1063,35 @@


// 审核订单
const reviewOrder = (state) => {
const reviewOrder = async (state) => {
  let differentSize = null
  if(state===0){
    await request.post(`/order/selectDifferentSize/${titleUploadData.value.orderId}`).then(res =>{
      differentSize = res.data
    })
  }
  let orderGlassState = null
  if(differentSize===true){
  await  ElMessageBox.confirm(
        '此订单含有手动修改大小片，反审修改订单后请重新重置大小片！是否反审？',
        t('order.msg.warning'),
        {
          confirmButtonText: t('basicData.confirmButtonText'),
          cancelButtonText: t('basicData.cancelButtonText'),
          type: 'warning',
        }
    )
        .then(async () => {

        })
        .catch(async () => {
          orderGlassState = false
        })
  }
  if (orderGlassState===false){
    return
  }

  request.post(`/order/reviewOrderById/${titleUploadData.value.orderId}/${state}/${userStore.user.userId}/${userStore.user.userName}`).then(res =>{
    if(res.code==200){
      gridOptions.toolbarConfig.buttons[2].disabled = true

 north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java

@@ -240,5 +240,11 @@
        return  Result.seccess(orderService.updateOrderId(map));
    }

    @ApiOperation("订单反审是否存在手动大小片")
    @PostMapping("/selectDifferentSize/{orderId}")
    public Result selectDifferentSize(@PathVariable String orderId)  {
        return  Result.seccess(orderService.selectDifferentSize(orderId));
    }


}

 north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderMapper.java

@@ -48,4 +48,6 @@
    Boolean updateOrderId(String oldOrderId,String newOrderId);

    Order selectOrderId(String orderId);

    List<Map<String,String>> selectDifferentSize(String orderId);
}

 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java

@@ -797,4 +797,8 @@
        }
        return saveState;
    }

    public Boolean selectDifferentSize(String orderId) {
        return !orderMapper.selectDifferentSize(orderId).isEmpty();
    }
}

 north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml

@@ -335,4 +335,20 @@
            o.order_id = #{orderId}

    </update>

    <select id="selectDifferentSize">

    select a.order_number,count(a.order_number),a.order_id from(select order_id,order_number
    from sd.order_glass_detail ogd
    where ogd.order_id = #{orderId}
    group by ogd.order_number,ogd.child_height,child_width)
    as a
    inner join order_detail od
        on od.order_id = a.order_id
        and od.order_number = a.order_number
        and (od.bend_radius is null or od.bend_radius = '')
    group by a.order_number
    having count(a.order_number) > 1
    </select>

</mapper>