提交发货单金额修改，订单打印次数统计

廖井涛

2024-07-06 a63145ac1499a46cac039fc8aaba229e7156148f

提交发货单金额修改，订单打印次数统计

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

@@ -208,6 +208,10 @@
        orderDetailsSummaryReport:'订单明细汇总报表',
        buildingNumber:'楼层编号',
        saveHeader:'保存表头',

        orderNotApproved:'订单未审核',
        orderHasBeenReceived:'订单已入库',
        printingNumber:'打印次数',
        msg:{
            productCheck:'请选择产品',
            tableLengthNot:'没有表格数据',
@@ -230,6 +234,8 @@
            calculationAreaPrompt4:'计算',
            warning:'提示',
            calculationAreaPrompt5:'订单重复是否继续创建',

            pleaseCancelTheFilteringFirst:'请先取消筛选',
        }

    },

 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue

@@ -103,21 +103,19 @@
    <div id="entirety" v-for="(item,id) in labelList" >
      <div class="row1">
        <span>{{ item.customer_name }}</span>&nbsp;
        <span>{{ item.order_id }}</span>&nbsp;
        <span v-if="item.type_name.includes('中空')">中空</span>
        <span v-else-if="item.type_name.includes('夹层')">夹层</span>
        <span v-else-if="item.type_name.includes('夹胶')">夹胶</span>
        <span v-else></span>
      </div>
      <div  class="row2">
        <span>{{ item.order_id }}</span>&nbsp;
      <div class="row2">
        <span>{{item.project}}</span>&nbsp;
        <span>{{ item.building_number }}</span>
      </div>
      <div class="row3" v-if="JSON.parse(item.other_columns).S02==null">{{item.width}}*{{item.height}}={{item.quantity}}</div>
      <div class="row3" v-else>{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
      <div class="row5">
        <span>{{item.project}}</span>&nbsp;
        <span>{{ item.building_number }}</span>
      </div>
      <div class="row6">
        <span>{{item.glass_child}}</span>&nbsp;
        <span>{{item.processing_note}}</span>
      </div>
@@ -151,32 +149,32 @@
}

.row1 {
  font-size: 10pt;
  font-size: 12pt;
  font-weight: bold;
  height: 20px;
  height: 25px;
}

.row2 {
  font-size: 10pt;
  font-size: 12pt;
  font-weight: bold;
  height: 20px;
  height: 25px;
}
span {
  font-size: 10pt;
  font-size: 12pt;
  font-weight: bold;
}

.row3 {
  margin-top: -5px;
  height: 25px;
  font-size: 15pt;
  height: 30px;
  font-size: 20pt;
  font-weight: bolder;
}

.row5 {
  height: 20px;
  height: 25px;
  font-weight: bold;
  font-size: 10pt;
  font-size: 12pt;
}
.row5 span {
  font-size: 10pt;

 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue

@@ -128,14 +128,13 @@
    <div id="entirety" v-for="(item,id) in labelList" >
        <div class="row1">
          <span>{{ item.customer_name }}</span>&nbsp;
          <span>{{ item.order_id }}</span>&nbsp;
          <span v-if="item.type_name.includes('中空')">中空</span>
          <span v-else-if="item.type_name.includes('夹层')">夹层</span>
          <span v-else-if="item.type_name.includes('夹胶')">夹胶</span>
          <span v-else></span>
        </div>
        <div  class="row2">
          <span>{{ item.order_id }}</span>&nbsp;
        </div>

        <div class="row3" v-if="JSON.parse(item.other_columns).S02==null">{{item.width}}*{{item.height}}={{item.quantity}}</div>
        <div class="row3" v-else>{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
        <div class="row5">
@@ -180,34 +179,39 @@
.row1 {
  font-size: 8pt;
  font-weight: bold;
  height: 16px;
  height: 20px;
}

.row2 {
  font-size: 8pt;
  font-weight: bold;
  height: 16px;
  height: 20px;
}
span {
  font-size: 10pt;
  font-weight: bold;
}

.row1 span {
  font-size: 8pt;
  font-weight: bold;
}

.row3 {
  margin-top: -5px;
  height: 19px;
  height: 25px;
  font-size: 12pt;
  font-weight: bolder;
}

.row5 {
  height: 15px;
  height: 20px;
  font-weight: bold;
  font-size: 8pt;
}

.row6 {
  height: 15px;
  height: 20px;
  font-weight: bold;
  font-size: 8pt;
}

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

@@ -455,7 +455,7 @@
            return
          }
          if ($grid.getTableData().tableData.length != $grid.getTableData().fullData.length){
            ElMessage.error("请先取消筛选")
            ElMessage.error(t('order.msg.pleaseCancelTheFilteringFirst'))
            return
          }
          let result = toolbarButtonClickEvent()

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

@@ -221,6 +221,7 @@
              ElMessage.warning(t('searchOrder.msgList.checkOrder'))
              return
            }
            ElMessage.warning(t('order.printingNumber')+rowClickIndex.value.printingNumber)
            dialogTableVisible.value = true
            sheetIndex.value=4
            if(rowClickIndex.value.processReview===2 && rowClickIndex.value.orderReview===0){
@@ -259,11 +260,11 @@
          }
          case 'oneClickStorage': {
            if(rowClickIndex.value.processReview===0||rowClickIndex.value.orderReview===0){
              ElMessage.warning('订单未审核')
              ElMessage.warning(t('order.orderNotApproved'))
              return
            }
            if(rowClickIndex.value.warehousing>0){
              ElMessage.warning('订单已入库')
              ElMessage.warning(t('order.orderHasBeenReceived'))
              return
            }
            request.post(`/FinishedGoodsInventory/oneClickStorage/${rowClickIndex.value.orderId}/${userStore.user.userName}`).then((res) => {
@@ -426,6 +427,16 @@
  })
}

const printingNumber = ()=>{
  request.post(`/order/updateOrderPrintNumber/${rowClickIndex.value.orderId}`).then(res =>{

  })
}

const closeDialog = ()=>{
  selectOrderList()
}

</script>

<template>
@@ -559,11 +570,12 @@
        :key="dialogKey"
        id="print"
        v-model="dialogTableVisible"
        @close="closeDialog"
        destroy-on-close
        style="width: 75%;height:75% "
    >
      <template #header="{ close, titleId, titleClass }">
        <el-button v-print="printContent"  :icon="Printer" circle />
        <el-button v-print="printContent" @click="printingNumber" :icon="Printer" circle />
        <el-button @click="exportFile" :icon="Download" circle />
        <el-button v-if="company.selectOrderReviewShow" :disabled="reviewDisabled" @click="reviewOrder" :icon="CircleCheck" type="primary">{{$t('basicData.review')}}</el-button>
      </template>

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

@@ -193,5 +193,12 @@
        return   Result.seccess(orderService.printOrderProductDetails(orderId,selectedValues));
    }

    @ApiOperation("订单打印计数")
    @PostMapping ("/updateOrderPrintNumber/{orderId}")
    public Result updateOrderPrintNumber(@PathVariable String orderId)  {

        return  Result.seccess(orderService.updateOrderPrintNumber(orderId));
    }


}

 north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java

@@ -92,6 +92,8 @@
    private Integer warehousing;
    @ExcelProperty("发货")
    private Integer delivery;
    @ExcelProperty("打印次数")
    private Integer printingNumber;
    @ExcelProperty("创建日期")
    private LocalDate createTime;
    @ExcelProperty("修改日期")

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

@@ -30,4 +30,6 @@
    List<Order> selectOrder(@Param("order") Order order);

    Integer selectMaxOrderIdByMonth();

    boolean updateOrderPrintNumber(@Param("orderId") String orderId);
}

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

@@ -218,7 +218,8 @@
            deliveryOtherMoneyList.forEach(deliveryOtherMoney -> {
                deliveryOtherMoney.setQuantity(0.0);
            });

            double otherMoneys=0.0;
            List <Map<String, Object>> moneryList=new ArrayList<Map<String, Object>>();//最终结果
            //获取对象集合循环进行新增修改
            if (!orderDetaillist.isEmpty()) {
                for (OrderDetail orderDetail : orderDetaillist) {
@@ -243,6 +244,23 @@

                    }
                    //根据订单计算方式进行金额计算


                    if(orderDetail.getOtherColumns()!="{}"&&orderDetail.getOtherColumns()!=null){
                        System.out.println(orderDetail.getOtherColumns());
                        JSONObject jsonObject = JSON.parseObject(orderDetail.getOtherColumns());
                        for(String key : jsonObject.keySet()){
                            boolean isnull = key.contains("M");
                            if(isnull) {
                                Map<String, Object> moneryItemmap = new HashMap<>();
                                Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(orderDetail.getOrderId(),orderDetail.getOrderNumber(), key, jsonObject.get(key).toString());
                                otherMoneys=otherMoneys+Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());
                                moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
                                moneryList.add(moneryItemmap);
                            }
                        }

                    }


                    //对循环明细的数据进行累加
@@ -284,7 +302,7 @@
                        deliveryOtherMoneyMapper.insertDeliveryOtherMoney(deliveryOtherMoney);
                    }
                });
                int intMoney= (int) Math.floor(money);
                int intMoney= (int) Math.floor(money+otherMoneys);
                //修改发货明细累加面积数量金额
                deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(intMoney), otherMoney.get(), oddNumber);

@@ -377,7 +395,7 @@
                            Map<String, Object> moneryItemmap = new HashMap<>();
                            Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectotherMoney(detail.getOrderDetail().getOrderId(),
                                    detail.getDeliveryId(),Integer.parseInt(stringObjectMap.get("order_number").toString()), key, jsonObject.get(key).toString());
                            otherMoney=otherMoney+Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());

                            moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
                            moneryList.add(moneryItemmap);
                        }

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

@@ -549,4 +549,8 @@


    }

    public boolean updateOrderPrintNumber(String orderId) {
        return orderMapper.updateOrderPrintNumber(orderId);
    }
}

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

@@ -371,7 +371,8 @@
               od.compute_gross_area,
               od.processing_note,
               od.edging_type,
               od.perimeter
               od.perimeter,
               od.other_columns
        from sd.order_detail od
                 left join sd.`order` o on od.order_id = o.order_id
                 left join mm.finished_goods_inventory fgi

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

@@ -235,4 +235,11 @@
        where order_id = #{order.orderId}
    </update>

    <update id="updateOrderPrintNumber">
        update sd.`order` o
            set o.printing_number=o.printing_number+1
        where
            o.order_id = #{orderId}

    </update>
</mapper>