2024.2.3提交sd模块相关代码

guoyuji

2024-02-03 ab0ac24c86067aaec92a2839280d73c08e458170

2024.2.3提交sd模块相关代码

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

@@ -124,10 +124,14 @@
  let selectDate = ref(["",""])
  let filterData = ref({})
  let orderList = ref([])
  let pageNum=ref(1)
  let pageTotal=ref()
  let dataTotal=ref()
  request.post(`/order/getOrderList/1/100/${orderType.value}/${selectDate.value}`,filterData).then((res) => {
    if(res.code==200){
      console.log(res.data)

      pageTotal.value=res.data.total
      selectDate.value=res.data.selectDate
      orderList.value = deepClone(res.data.data)
      xGrid.value.loadData(orderList.value)
    }else{
@@ -135,12 +139,62 @@
    }
  })

  const changeFilterEvent = (event, option, $panel,) => {
    // 手动触发筛选
    $panel.changeOption(event, !!option.data, option)
  }

  function filterChanged(column){
    gridOptions.loading=true
    //筛选条件发生变化条件发生变化
    let value = column.datas[0]!=undefined?column.datas[0]:''
    value = value.trim()
    //判断是否存在外键
    if (column.property.indexOf('.')>-1){
      const  columnArr = column.property.split('.')
      filterData.value[columnArr[0]] = {
        [columnArr[1]]:value
      }
    }else{
      filterData.value[column.property] = value
    }
    request.post(`/order/getOrderList/1/100/${orderType.value}/${selectDate.value}`,filterData.value).then((res) => {
      if(res.code==200){
        pageTotal.value=parseInt(res.data.total)
        pageNum.value=1
        orderList.value = deepClone(res.data.data)
        xGrid.value.loadData(orderList.value)
        gridOptions.loading=false
      }else{
        ElMessage.warning(res.msg)
      }
    })
  }

  //双击表格行
  // const cellClickEvent =()=>{
  //     dialogTableVisible.value = true
  // }
  const cellClickEvent =()=>{
    return
      dialogTableVisible.value = true
  }
  const selectOrderList = ()=>{
    request.post(`/order/getOrderList/1/100/${orderType.value}/${selectDate.value}`,filterData).then((res) => {
      if(res.code==200){
        pageTotal.value=res.data.total
        selectDate.value=res.data.selectDate
        orderList.value = deepClone(res.data.data)
        xGrid.value.loadData(orderList.value)
      }else{
        ElMessage.warning(res.msg)
      }
    })
  }


  const changeOrderType = ()=>{
    selectOrderList()
  }
 const changeDate =  ()=>{
   selectOrderList()
 }


</script>
@@ -148,13 +202,17 @@
<template>
  <div  style="width: 100%;height: 100%">
    <el-date-picker
        v-model="value1"
        v-model="selectDate"
        type="daterange"
        start-placeholder="开始时间"
        end-placeholder="结束时间"
        format="YYYY-MM-DD"
        value-format="YYYY-MM-DD"

    />
    <el-button style="margin-top: -5px"  id="searchButton" type="primary" :icon="Search">查询</el-button>
    <el-button @click="changeDate" style="margin-top: -5px"  id="searchButton" type="primary" :icon="Search">查询</el-button>
    <vxe-grid
        @filter-change="filterChanged"
        @cell-dblclick="cellClickEvent"
        max-height="97%"
        class="mytable-scrollbar"
@@ -191,14 +249,24 @@
        </div>
      </template>


      <template #toolbar_buttons>
        <vxe-select v-model="orderType" placeholder="订单类型">
        <vxe-select @change="changeOrderType" v-model="orderType" placeholder="订单类型">
          <vxe-option value="2" label="正常订单"></vxe-option>
          <vxe-option value="-2" label="作废订单"></vxe-option>
          <vxe-option value="" label="全部订单"></vxe-option>
          <vxe-option value="0" label="全部订单"></vxe-option>
        </vxe-select>
      </template>

      <template #pager>
        <!--使用 pager 插槽-->
        <vxe-pager
            :layouts="[ 'PrevJump', 'PrevPage', 'Jump','PageCount', 'NextPage', 'NextJump',  'Total']"
            v-model:current-page="pageNum"
            v-model:page-size="pageTotal"
            :total="dataTotal"
        >
        </vxe-pager>
      </template>
    </vxe-grid>

    <el-dialog v-model="dialogTableVisible" title="流程卡进度" style="width: 80%;height:75% ">

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

@@ -32,7 +32,7 @@
    }

    @PostMapping("/getOrderList/{pageNum}/{pageSize}/{orderType}/{selectDate}")
    public Result getOrderList(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable Integer orderType, @PathVariable List<LocalDate> selectDate, @RequestBody Order order)  {
    public Result getOrderList(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable Integer orderType, @PathVariable List<String> selectDate, @RequestBody Order order)  {
        return Result.seccess(orderService.getOrderList(pageNum, pageSize, selectDate, order,orderType));
    }
}

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

@@ -16,6 +16,6 @@

    boolean updateOrderParameter(@Param("orderId") String orderId);

    List<Order> getOrderList(Integer offset, Integer pageSize, LocalDate startDate, LocalDate endDate, Order order, Integer orderType);
    Integer getPageTotal(Integer offset, Integer pageSize, LocalDate startDate, LocalDate endDate, Order order , Integer orderType);
    List<Order> getOrderList(Integer offset, Integer pageSize, String startDate, String endDate, Order order, Integer orderType);
    Integer getPageTotal(Integer offset, Integer pageSize, String startDate, String endDate, Order order , Integer orderType);
}

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

@@ -138,21 +138,26 @@
    }

    //查询获取列表
    public Map<String,Object> getOrderList(Integer pageNum, Integer pageSize, List<LocalDate> selectDate, Order order,Integer orderType) {
    public Map<String,Object> getOrderList(Integer pageNum, Integer pageSize, List<String> selectDate, Order order,Integer orderType) {
        Integer offset = (pageNum-1)*pageSize;
        LocalDate endDate = LocalDate.now();
        LocalDate startDate = endDate.minusDays(15);

        if(selectDate == null && selectDate.size()==2){
            startDate = selectDate.get(0);
            endDate = selectDate.get(1);
        String endDate = LocalDate.now().toString();
        String startDate = LocalDate.now().minusDays(15).toString();
        if(selectDate !=null && selectDate.size()==2){
            if(!selectDate.get(0).isEmpty()){
                startDate = selectDate.get(0);
            }
            if(!selectDate.get(1).isEmpty()){
                endDate = selectDate.get(1);
            }
        }

        Map<String,Object> map = new HashMap<>();
        map.put("data",orderMapper.getOrderList(offset, pageSize, startDate, endDate, order,orderType));
        map.put("total",orderMapper.getPageTotal(offset, pageSize, startDate, endDate, order,orderType));
        map.put("startDate",startDate);
        map.put("endDate",endDate);
        List<String> list = new ArrayList<>();
        list.add(startDate);
        list.add(endDate);
        map.put("selectDate",list);
        return map;
    }
}

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

@@ -33,7 +33,7 @@
            *
        from
            `order` as o
        where  o.create_time>=#{startDate} and o.create_time &lt;= #{endDate}
        where  date(o.create_time)>=#{startDate} and date(o.create_time) &lt;= #{endDate}

          <if test="orderType!= null and orderType != ''">
               and o.create_order = #{orderType}

 north-glass-erp/target/classes/mapper/mm/FinishedGoodsInventory.xml

@@ -4,7 +4,7 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="com.example.erp.mapper.mm.FinishedGoodsInventoryMapper">
    <!--映射成品库存-->
    <!--映射成品库存-->
    <resultMap id="selectFinishedGoodsInventory" type="com.example.erp.entity.mm.FinishedGoodsInventory">
        <id column="fid" property="id"/>
        <result column="inventory" property="inventory"/>
@@ -31,7 +31,7 @@
        <result column="product_id" property="orderDetail.productId"/>

    </resultMap>
    <!--映射成品入库-->
    <!--映射成品入库-->
    <resultMap id="selectFlowCard" type="com.example.erp.entity.pp.FlowCard">
        <id column="id" property="id"/>
        <result column="order_number" property="orderNumber"/>
@@ -55,7 +55,7 @@
        <result column="quantity" property="orderDetail.quantity"/>
    </resultMap>

    <!--映射成品出库-->
    <!--映射成品出库-->
    <resultMap id="selectDelivery" type="com.example.erp.entity.sd.OrderDetail">
        <id column="id" property="id"/>
        <result column="building_number" property="buildingNumber"/>
@@ -82,7 +82,7 @@

    </resultMap>

    <!--映射订单调拨-->
    <!--映射订单调拨-->
    <resultMap id="selectDeliveryFinishedGoodsInventory" type="com.example.erp.entity.sd.OrderDetail">

        <result column="width" property="width"/>

 north-glass-erp/target/classes/mapper/sd/OrderMapper.xml

@@ -33,7 +33,7 @@
            *
        from
            `order` as o
        where  o.create_time>=#{startDate} and o.create_time &lt;= #{endDate}
        where  date(o.create_time)>=#{startDate} and date(o.create_time) &lt;= #{endDate}

          <if test="orderType!= null and orderType != ''">
               and o.create_order = #{orderType}