Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2024-07-02 d39c0479c9ddd38dc36b3c2e29a4e5a3b24fd3d7

Merge branch 'master' of http://bore.pub:10439/r/ERP_override

 north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue

@@ -104,32 +104,32 @@
        <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;">发货单号：<span>{{delivery.deliveryId}}</span></th>
      </tr>
      <tr>
        <th style="text-align: left;border:none;font-weight: bold;" colspan="4">客户名称：<span>{{delivery.customerName}}</span></th>
        <th style="text-align: left;border:none;font-weight: bold;" colspan="3">项目名称：<span>{{delivery.project}}</span></th>
        <th style="text-align: left;border:none;font-weight: bold;" colspan="2">联系人：<span>{{delivery.contacts}}</span></th>
        <th style="text-align: left;border:none;" colspan="4">客户名称：<span>{{delivery.customerName}}</span></th>
        <th style="text-align: left;border:none;" colspan="3">项目名称：<span>{{delivery.project}}</span></th>
        <th style="text-align: left;border:none;" colspan="2">联系人：<span>{{delivery.contacts}}</span></th>
      </tr>
      <tr>
        <th style="text-align: left;border:none;font-weight: bold;" colspan="7">送货地址：<span>{{delivery.deliveryAddress}}</span></th>
        <th style="text-align: left;border:none;font-weight: bold;" colspan="2">联系电话：<span>{{delivery.contactNumber}}</span></th>
        <th style="text-align: left;border:none;" colspan="7">送货地址：<span>{{delivery.deliveryAddress}}</span></th>
        <th style="text-align: left;border:none;" colspan="2">联系电话：<span>{{delivery.contactNumber}}</span></th>
      </tr>
      <tr>
        <th style="width: 6%;font-weight: bold;">序号</th>
        <th style="width: 20%;font-weight: bold;">楼层编号</th>
        <th style="width: 20%;font-weight: bold;" colspan="2">宽(弧度)*高</th>
        <th style="width: 10%;font-weight: bold;">数量</th>
        <th style="width: 10%;font-weight: bold;">面积</th>
        <th style="width: 10%;font-weight: bold;">单价</th>
        <th style="width: 12%;font-weight: bold;">金额</th>
        <th style="width: 12%;font-weight: bold;" colspan="2">加工要求</th>
        <th style="width: 6%;">序号</th>
        <th style="width: 20%;">楼层编号</th>
        <th style="width: 20%;" colspan="2">宽(弧度)*高</th>
        <th style="width: 10%;">数量</th>
        <th style="width: 10%;">面积</th>
        <th style="width: 10%;">单价</th>
        <th style="width: 12%;">金额</th>
        <th style="width: 12%;" colspan="2">加工要求</th>
      </tr>
      <template v-for="(item, index) in produceList" :key="index" >
        <tr>
          <td style="font-size: 15px;font-weight: bold;text-align: left" colspan="4">产品名称:<span>{{item.DeliveryDetail.orderDetail.productName}}</span></td>
          <td style="font-size: 15px;font-weight: bold;text-align: left" colspan="3">对方单号:</td>
          <td style="font-size: 15px;font-weight: bold;text-align: left" colspan="3">订单编号:<span>{{item.DeliveryDetail.orderDetail.orderId}}</span></td>
          <td style="font-size: 15px;text-align: left" colspan="4">产品名称:<span>{{item.DeliveryDetail.orderDetail.productName}}</span></td>
          <td style="font-size: 15px;text-align: left" colspan="3">对方单号:</td>
          <td style="font-size: 15px;text-align: left" colspan="3">订单编号:<span>{{item.DeliveryDetail.orderDetail.orderId}}</span></td>
        </tr>

        <tr class="day-in" v-for="(items, index1) in item.DeliveryDetailList" :key="index1">
@@ -143,7 +143,7 @@
          <td colspan="2">{{items.processingNote}}</td>
        </tr>
        <tr class="day-in" >
          <td style="font-size: 15px;font-weight: bold;" colspan="4">小计:</td>
          <td style="font-size: 15px;" colspan="4">小计:</td>
          <td>{{item.DeliveryDetail.quantity}}</td>
          <td>{{item.DeliveryDetail.area}}</td>
          <td></td>
@@ -153,7 +153,7 @@

      </template>
      <tr class="day-in">
        <td style="font-size: 15px;font-weight: bold;" colspan="4">合计:</td>
        <td style="font-size: 15px;" colspan="4">合计:</td>
        <td>{{delivery.quantity}}</td>
        <td>{{delivery.area}}</td>
        <td></td>
@@ -169,7 +169,7 @@
            <div  style="width: 25%">金额</div>
          </div>
        </td>
        <td style="text-align: left;border:none;font-size: 15px;font-weight: bold;" colspan="5">总金额:&nbsp;&nbsp;&nbsp;&nbsp;{{delivery.money}}</td>
        <td style="text-align: left;border:none;font-size: 15px;" colspan="5">总金额:&nbsp;&nbsp;&nbsp;&nbsp;{{delivery.money}}</td>
      </tr>
      <tr class="day-in">
        <td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6;" colspan="4" >
@@ -210,6 +210,9 @@


<style scoped>
#child{
  margin-top: 20px;
}
h1,h3{
  left:0;
  right:0;
@@ -222,7 +225,6 @@
}
h3{
  font-size: 1.2rem;
  font-weight: bolder;
}



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

@@ -35,9 +35,8 @@
const lableType = route.query.lableType

onMounted(() => {
      request.post(`/processCard/getSelectPrintCustomLabel/${type}`, data.value).then((res) => {
      request.post(`/processCard/getSelectPrintCustomLabel/${type}/${lableType}`, data.value).then((res) => {
        if (res.code == 200) {
          console.log(res.data.data)
          produceList.value = deepClone(res.data.title)
          list.value = deepClone(res.data.data)
          const data = produceList.value[0].value
@@ -138,10 +137,11 @@
  justify-content: left;
  flex-wrap: wrap;
  margin-left: 5px;
  margin-top: 15px;

}

#entirety{
  margin-top: 15px;
  text-align: center;
  width: 337px;
  height: 120px;

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

@@ -35,9 +35,8 @@
const lableType = route.query.lableType

onMounted(() => {
      request.post(`/processCard/getSelectPrintCustomLabel/${type}`, data.value).then((res) => {
      request.post(`/processCard/getSelectPrintCustomLabel/${type}/${lableType}`, data.value).then((res) => {
        if (res.code == 200) {
          console.log(res.data.data)
          produceList.value = deepClone(res.data.title)
          list.value = deepClone(res.data.data)
          const data = produceList.value[0].value
@@ -139,7 +138,6 @@
  justify-content: left;
  flex-wrap: wrap;
  margin-left: 5px;
  margin-top: 15px;
}

#entirety{

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

@@ -37,7 +37,7 @@
          ElMessage.success(t('workOrder.deleteOk'))
          router.push({path: '/main/processCard/SelectProcessCard', query: {random: Math.random()}})
        } else {
          ElMessage.warning(t('processCard.deleteOk'))
          ElMessage.warning(t('processCard.deleteNo'))
        }
      })


 north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryPrinting.vue

@@ -238,7 +238,6 @@
  border: 1px solid #d3dce6;
  border-collapse: collapse;
  font-size: 15px;
  font-weight: bold;
}
.day-in td{
text-align: center;
@@ -258,8 +257,7 @@
  display: none;
}*/
.bottom{
  font-size: 10px;
  font-weight: bold;
  font-size: 12px;

}


 north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue

@@ -259,6 +259,7 @@
    {field: 'customerId',width:120,  title: t('customer.customerNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'customerName',width:120,  title: t('customer.customerName'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'project',width:120,  title: t('order.project'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'money',width:120,  title: t('order.grossAmount'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'orderId',width:120,   title: t('order.OrderNum'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'paymentTerms',width:120,  title: t('delivery.paymentTerms'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'payMethod',width:120,  title:t('delivery.paymentMethod'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
@@ -278,7 +279,7 @@
  },

  footerMethod ({ columns, data }) {//页脚函数
    let footList=['quantity','area']
    let footList=['quantity','area','money']
    return[
      columns.map((column, columnIndex) => {
        if (columnIndex === 0) {

 north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java

@@ -176,7 +176,7 @@


                    Integer ordersum = finishedGoodsInventoryMapper.findOrderQuantity(orderDetail.getDeliveryDetail().getOrderId());
                    Integer orderDeliveryQuantitySum = finishedGoodsInventoryMapper.findOrderDeliveryQuantitySum(orderDetail.getDeliveryDetail().getOrderId());
                    Integer orderNumberdsum = finishedGoodsInventoryMapper.findOrderNumberdsum(orderDetail.getDeliveryDetail().getOrderId());

                    Integer deliverysum = finishedGoodsInventoryMapper.findDeliveryQuantity(orderDetail.getDeliveryDetail().getDeliveryId());
                    Integer deliverydetailsum = finishedGoodsInventoryMapper.findDeliverydetailsum(orderDetail.getDeliveryDetail().getDeliveryId(),0);
@@ -184,7 +184,7 @@
                        deliverydetailsum=0;
                    }

                    /*System.out.println("订单总数:" + ordersum + "订单已发数量：" + orderDeliveryQuantitySum + "准备出库数量" +
                    /*System.out.println("订单总数:" + ordersum + "订单库存数：" + orderNumberdsum + "准备出库数量" +
                            orderDetail.getWarehouseNum()+ "发货数量" + orderDetail.getDeliveryDetail().getQuantity()+ "发货总数" +
                            deliverysum+ "已发数量" + deliverydetailsum);*/
                    if (finishedGoodsInventorycount > 0) {
@@ -200,7 +200,8 @@
                            //修改订单表发货状态
                            finishedGoodsInventoryMapper.updateOrderDeliveryState(orderDetail.getDeliveryDetail().getOrderId(),1);
                            //判断订单是否全部发货
                            if (ordersum == (orderDeliveryQuantitySum + orderDetail.getWarehouseNum())) {
                            if (orderNumberdsum == orderDetail.getWarehouseNum()) {
                                //if (ordersum == (orderDeliveryQuantitySum + orderDetail.getWarehouseNum())) {
                                //修改订单表发货状态
                                finishedGoodsInventoryMapper.updateOrderDeliveryState(orderDetail.getDeliveryDetail().getOrderId(),2);
                            }

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

@@ -275,8 +275,9 @@
                        deliveryOtherMoneyMapper.insertDeliveryOtherMoney(deliveryOtherMoney);
                    }
                });
                int intMoney= (int) Math.floor(money);
                //修改发货明细累加面积数量金额
                deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(String.format("%.2f", money)), otherMoney.get(), oddNumber);
                deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(intMoney), otherMoney.get(), oddNumber);

            } else {
                return false;

 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml

@@ -578,11 +578,11 @@
               ifnull(od.processing_note,'') as processing_note
        from sd.order as o
                 left join sd.order_detail as od on o.order_id = od.order_id
                 left join sd.order_glass_detail as ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number
                 left join pp.flow_card as fc on o.order_id = fc.order_id and
                                                 od.order_number = fc.order_number
                                                 od.order_number = fc.order_number and fc.technology_number=ogd.technology_number
                 left join sd.product pt on pt.id=od.product_id
                 left join sd.customer c on c.id=o.customer_id
                    left join sd.order_glass_detail ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number
        where fc.process_id = #{processId}
          and fc.technology_number=#{technologyNumber}
        group by od.order_number,od.width,od.height

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

@@ -218,7 +218,7 @@

    <select id="getSelectShippingOrderDetailPrinting" >
        select
        d.order_id,d.quantity,d.money,d.area,d.project,
        d.order_id,d.quantity,round(d.money,0) as money ,d.area,d.project,
        d.customer_id,d.customer_name,d.creator,d.salesman,d.salesman_id
        from sd.`order` d
        <where>