提交订单创建界面修改

廖井涛

2024-06-19 5bc44188c67b7d5842217ab2a9ea9cd1c845c284

提交订单创建界面修改

 north-glass-erp/northglass-erp/public/importTemplate.xlsx

Binary files differ

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

@@ -33,7 +33,7 @@

  columns:[
    {type: 'seq', title: t('basicData.Number'), width: 80 },
    // {field: 'buildingNumber',width:120,  title: '楼号',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
    {field: 'buildingNumber',width:120,  title: t('order.floorNumber'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
    {field: 'productId',width:140,  title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'productName',width:300,  title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    //{field: 'price',width:140,  title: t('order.price'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
@@ -46,7 +46,7 @@
    {field: 'computeArea',width:180,  title: t('order.computeArea'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'computeGrossArea',width:200,  title: t('order.computeGrossArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'processingNote',width:200,  title: t('order.processingNote'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'remarks',width:140,  title: t('order.floorNumber'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'remarks',width:140,  title: t('basicData.remarks'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'shape',width:120,
      title: t('order.shape'),
      editRender: { name: 'input'},

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

@@ -139,9 +139,9 @@
  },//表头参数
  columns:[
    {type: 'seq',fixed:"left", title: t('basicData.Number'), width: 80 },
    {field: 'buildingNumber',width:120,  title: '楼号',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
    {field: 'productId',width:140,  title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'productName',width:300,  title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'buildingNumber',width:120,  title: t('order.floorNumber'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
    {field: 'price',width:140,  title: t('order.price'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'grossAmount',width:160,  title: t('order.grossAmount'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'width',width:120,  title: t('order.width') ,editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
@@ -242,7 +242,8 @@
      {'code': 'Craft', 'name': t('order.technology'),status: 'primary',disabled: true},
      {'code': 'review', 'name': t('basicData.review'),status: 'primary',disabled: true},
      {'code': 'updateMoney', 'name': t('order.amountReset'),status: 'primary',disabled: true},
      {'code': 'saveOrder', 'name': t('basicData.save'),status: 'primary',icon: 'vxe-icon-save',disabled: false}
      {'code': 'saveOrder', 'name': t('basicData.save'),status: 'primary',icon: 'vxe-icon-save',disabled: false},

    ],
    slots: {
      tools: 'toolbar_buttons'
@@ -362,14 +363,67 @@
              }
              ).then(()=>{
                errorAreaComputed()
                saveOrder(order)
                selectOrder(order)
              }).catch(()=>{
                saveOrder(order)
                selectOrder(order)
              })

            }else {
              saveOrder(order)
              selectOrder(order)
            }





          }
          break
        }
        case 'saveOrderTitle': {
          if(!gridOptions.menuConfig.body.options[0][5].disabled){
            ElMessage.error(t('order.msg.amountReset'))
            return
          }

          const project = titleUploadData.value.project
          if(project === null || project === undefined || project === ''){
            ElMessage.error(t('order.msg.projectCheck'))
            return
          }
          const customer = titleUploadData.value.customerId
          if(customer === null || customer === undefined || customer === ''){
            ElMessage.error(t('order.msg.customerCheck'))
            return
          }
          const salasMan = titleUploadData.value.salesman
          if(salasMan === null || salasMan === undefined || salasMan === ''){
            ElMessage.error(t('order.msg.salasManCheck'))
            return
          }
          const calculateType = titleUploadData.value.calculateType
          if(calculateType === null || calculateType === undefined || calculateType === ''){
            ElMessage.error(t('order.msg.calculateTypeCheck'))
            return
          }

          if ($grid) {
            const errMap = await $grid.validate(true)
            if (errMap) {
              ElMessage.error(t('basicData.msg.checkoutLose'))
              return
            }

            let order ={
              title:titleUploadData.value,
              detail:$grid.getTableData().fullData,
              otherMoney:otherMoney.value
            }
            const errorAreaList = $grid.getTableData().fullData.filter(
                item=>item.computeArea*1 < errorArea.value*1
            )

            saveOrderTitle(order)




@@ -419,13 +473,35 @@
        case 'copyChecked' :{
          let result = toolbarButtonClickEvent()
          if(result){
            const dataList = xGrid.value.getTableData().visibleData
            const val = dataList[result.start][result.cell]
            dataList.forEach((item,index) =>{
              if(index>=result.start && index<=result.end){
                item[result.cell] = val
              }
            })
            if(result.cell=='productName'){
              const dataList = xGrid.value.getTableData().visibleData
              const val = dataList[result.start][result.cell]
              const val1 = dataList[result.start]["productId"]
              dataList.forEach((item,index) =>{
                if(index>=result.start && index<=result.end){
                  item[result.cell] = val
                  item["productId"] = val1
                }
              })
            }else if(result.cell=='productId'){
              const dataList = xGrid.value.getTableData().visibleData
              const val = dataList[result.start][result.cell]
              const val1 = dataList[result.start]["productName"]
              dataList.forEach((item,index) =>{
                if(index>=result.start && index<=result.end){
                  item[result.cell] = val
                  item["productName"] = val1
                }
              })
            }else{
              const dataList = xGrid.value.getTableData().visibleData
              const val = dataList[result.start][result.cell]
              dataList.forEach((item,index) =>{
                if(index>=result.start && index<=result.end){
                  item[result.cell] = val
                }
              })
            }
          }
          gridOptions.menuConfig.body.options[0][5].disabled=false
          break
@@ -433,13 +509,36 @@
        case 'copyAll' :{
          let result = toolbarButtonClickEvent()
          if(result){
            const dataList = xGrid.value.getTableData().visibleData
            const val = dataList[result.start][result.cell]
            dataList.forEach((item,index) =>{
              if(index>=result.start ){
                item[result.cell] = val
              }
            })
            if(result.cell=='productName'){
              const dataList = xGrid.value.getTableData().visibleData
              const val = dataList[result.start][result.cell]
              const val1 = dataList[result.start]["productId"]
              dataList.forEach((item,index) =>{
                if(index>=result.start ){
                  item[result.cell] = val
                  item["productId"] = val1
                }
              })
            }else if(result.cell=='productId'){
              const dataList = xGrid.value.getTableData().visibleData
              const val = dataList[result.start][result.cell]
              const val1 = dataList[result.start]["productName"]
              dataList.forEach((item,index) =>{
                if(index>=result.start ){
                  item[result.cell] = val
                  item["productName"] = val1
                }
              })
            }else{
              const dataList = xGrid.value.getTableData().visibleData
              const val = dataList[result.start][result.cell]
              dataList.forEach((item,index) =>{
                if(index>=result.start ){
                  item[result.cell] = val
                }
              })
            }

          }
          gridOptions.menuConfig.body.options[0][5].disabled=false
          break
@@ -568,6 +667,10 @@
          status: 'primary',
          'name': (res.data.order.orderReview>0?t('basicData.cancel'):t('basicData.restore'))}
        gridOptions.toolbarConfig.buttons.push(button)
        const buttonTitle = {'code': 'saveOrderTitle',
          status: 'primary',
          'name': (res.data.order.orderReview>0?'保存表头':'保存表头')}
        gridOptions.toolbarConfig.buttons.push(buttonTitle)
        if(res.data.order.orderReview===-2){
          gridOptions.toolbarConfig.buttons[2].disabled = true
          gridOptions.toolbarConfig.buttons[3].disabled = true
@@ -665,6 +768,34 @@
  }
})

//查询重复订单方法
const selectOrder = (order) => {
  console.log(order)
  request.post(`/order/selectOrder`,order).then((res) => {
    if(res.code==200){
      if(res.data.data>0){
        ElMessageBox.confirm(`${t('order.msg.calculationAreaPrompt1')}
                  订单重复是否继续创建`,
            t('order.msg.warning'),
            {
              confirmButtonText: t('basicData.confirmButtonText'),
              cancelButtonText: t('basicData.cancelButtonText'),
              type: 'warning',
            }
        ).then(()=>{
          saveOrder(order)
        }).catch(()=>{
        })
      }else{
        saveOrder(order)
      }
    }
  }).catch((err)=>{
    ElMessage.error(t('basicData.msg.ServerConnectionError'))
    router.push("/login")
  })
}

//保存订单方法
const saveOrder = (order) => {
  request.post(`/order/saveOrder`,order).then((res) => {
@@ -677,6 +808,18 @@
  })
}

//保存订单表头方法
const saveOrderTitle = (order) => {
  request.post(`/order/saveOrderTitle`,order).then((res) => {
    if(res.code==200){
      ElMessage.success(t('basicData.msg.saveSuccess'))
      router.push({path:'/main/order/selectOrder'})
    }else {
      ElMessage.error(res.msg)
    }
  })
}

//更新金额
const updateMoney = () => {
  const updateData = {

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

@@ -41,6 +41,24 @@
            throw new ServiceException(Constants.Code_500,Constants.Code_msg);
        }
    }

    @ApiOperation("订单保存")
    @PostMapping("/saveOrderTitle")
    @SaCheckPermission("createOrder.add")
    public Result saveOrderTitle(@RequestBody Map<String, Object> orderMap) throws Exception {
        if(orderService.saveOrderTitle(orderMap))    {
            return Result.seccess(true);
        }else{
            throw new ServiceException(Constants.Code_500,Constants.Code_msg);
        }
    }

    @ApiOperation("重复订单查询")
    @SaCheckPermission("createOrder.search")
    @PostMapping("/selectOrder")
    public Result selectOrder(@RequestBody Map<String, Object> orderMap) throws Exception {
        return Result.seccess(orderService.selectOrder(orderMap));
    }
    @ApiOperation("订单分页筛选查询")
    @SaCheckPermission("selectOrder.search")
    @PostMapping("/getOrderList/{pageNum}/{pageSize}/{orderType}/{selectDate}")

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

@@ -19,9 +19,13 @@

    boolean reviewOrderById(String id, Integer status, String userId, String userName);

    boolean reviewOrderByIds(String id, Integer status, String userId, String userName);

    boolean reviewProcessById(String id, Integer status);

    boolean updateMoney(@Param("order") Order order);

    Integer cancelOrder(String id);

    Integer selectOrder(@Param("order") Order order);
}

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

@@ -72,6 +72,44 @@
        }
        return saveState;
    }

    public boolean saveOrderTitle(Map<String,Object> orderMap) throws Exception {
        JSONObject orderJson = new JSONObject(orderMap);
        Order order = JSONObject.parseObject(JSONObject.toJSONString(orderJson.get("title")), Order.class);

        boolean saveState = true;
        //设置回滚点
        Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
        //判断传入id参数是否为空，未传入id为空插入订单表，传入更新表
        try{
            LambdaUpdateWrapper<Order> updateWrapper = new LambdaUpdateWrapper<>();
            updateWrapper.eq(Order::getOrderId, order.getOrderId());
            orderMapper.update(order,updateWrapper);
            //修改订单主表面积与周长以及重量
            orderMapper.updateOrderParameter(order.getOrderId());

        }catch (Exception e){
            TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e.toString());
            sysError.setFunc("saveOrder");
            sysErrorService.insert(sysError);
            saveState = false;

            //throw new Exception();
        }
        return saveState;
    }


    public Map<String,Object> selectOrder(Map<String,Object> orderMap) throws Exception {
        JSONObject orderJson = new JSONObject(orderMap);
        Order order = JSONObject.parseObject(JSONObject.toJSONString(orderJson.get("title")), Order.class);
        Map<String,Object> map = new HashMap<>();
        map.put("data",orderMapper.selectOrder(order));
        return map;
    }
    //生成订单数据
    public void insertOrder(Order order,List<OrderDetail> OrderDetails,List<OrderOtherMoney> orderOtherMoneyList) {
        Integer maxOrderId = orderMapper.selectMaxOrderId();
@@ -86,7 +124,9 @@
        order.setOrderId(orderId);
        order.setCreateOrder(2);
        orderMapper.insert(order);

        insertOtherDetail(orderId,OrderDetails,orderOtherMoneyList);


    }
    //修改订单数据，并且重新生成多个副表数据
@@ -94,17 +134,17 @@
        LambdaUpdateWrapper<Order> updateWrapper = new LambdaUpdateWrapper<>();
        updateWrapper.eq(Order::getOrderId, order.getOrderId());
        orderMapper.update(order,updateWrapper);
        //删除订单明细表
        orderDetailMapper.delete(new LambdaQueryWrapper<OrderDetail>().eq(OrderDetail::getOrderId, order.getOrderId()));
        //删除订单小片表
        orderGlassDetailMapper.delete(new LambdaQueryWrapper<OrderGlassDetail>().eq(OrderGlassDetail::getOrderId, order.getOrderId()));
        //删除其他金额明细表
        orderOtherMoneyMapper.delete(new LambdaQueryWrapper<OrderOtherMoney>().eq(OrderOtherMoney::getOrderId, order.getOrderId()));
            //删除订单明细表
            orderDetailMapper.delete(new LambdaQueryWrapper<OrderDetail>().eq(OrderDetail::getOrderId, order.getOrderId()));
            //删除订单小片表
            orderGlassDetailMapper.delete(new LambdaQueryWrapper<OrderGlassDetail>().eq(OrderGlassDetail::getOrderId, order.getOrderId()));
            //删除其他金额明细表
            orderOtherMoneyMapper.delete(new LambdaQueryWrapper<OrderOtherMoney>().eq(OrderOtherMoney::getOrderId, order.getOrderId()));


        //删除订单工艺表
       // orderProcessDetailMapper.delete(new LambdaQueryWrapper<OrderProcessDetail>().eq(OrderProcessDetail::getOrderId, order.getOrderId()));
        insertOtherDetail(order.getOrderId(),OrderDetails,orderOtherMoneyList);
            //删除订单工艺表
            // orderProcessDetailMapper.delete(new LambdaQueryWrapper<OrderProcessDetail>().eq(OrderProcessDetail::getOrderId, order.getOrderId()));
            insertOtherDetail(order.getOrderId(),OrderDetails,orderOtherMoneyList);
    }


@@ -239,8 +279,12 @@
        Order order = orderMapper.selectOne(new QueryWrapper<Order>().eq("order_id",id));
        if(order.getProcessReview()!=2){
            throw  new ServiceException(Constants.Code_600,"该订单还未审核");
        }else if(status==0){
            return orderMapper.reviewOrderByIds(id,status,userId,userName);
        }else{
            return orderMapper.reviewOrderById(id,status,userId,userName);
        }
        return orderMapper.reviewOrderById(id,status,userId,userName);

    }
    //工艺审核界面审核更新数据
    public boolean reviewProcessById(String id, Integer status,List<OrderGlassDetail> orderGlassDetails) {

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

@@ -3,6 +3,16 @@
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.example.erp.mapper.sd.OrderMapper">

    <select id="selectOrder">
        select
            count(*)
        from
            sd.`order` as o
        where
            o.quantity=#{order.quantity} and o.area=#{order.area} and o.project=#{order.project} and o.customer_id=#{order.customerId} and o.money=#{order.money}
    </select>

    <select id="selectMaxOrderId">
        select
           ifnull(SUBSTR(max(order_id) from 9),0)
@@ -186,6 +196,12 @@
                           verifier = #{userName}
                           where order_id = #{id}
    </update>
    <update id="reviewOrderByIds">
        update `order` set order_review = #{status},process_review = #{status},
                           verifier_id = #{userId},
                           verifier = #{userName}
        where order_id = #{id}
    </update>

    <update id="reviewProcessById">
        update `order` set process_review = #{status} where order_id = #{id}