Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

廖井涛

2025-07-08 ae5a0421846584e31d3c3572217f2bd8a9adff3e

Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

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

@@ -201,7 +201,8 @@
        <th style="text-align: left;border:none;font-weight: bold;" 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="4">送货地址：<span>{{delivery.deliveryAddress}}</span></th>
        <th style="text-align: left;border:none;font-weight: bold;" colspan="3">送货时间：<span>{{delivery.deliveryDate}}</span></th>
        <th style="text-align: left;border:none;font-weight: bold;" colspan="2">联系电话：<span>{{delivery.contactNumber}}</span></th>
      </tr>
      <tr>

 north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java

@@ -182,4 +182,10 @@
        return Result.seccess(reportingWorkService.selectReportingWorkRecordByPhoneSv(selectPam));
    }

    @ApiOperation("手机查询本工序设备")
    @PostMapping("/selectEquipmentByProcess/{process}")
    public Result selectEquipmentByProcess(@PathVariable String process)    {
        return Result.seccess(reportingWorkService.selectEquipmentByProcessSv(process));
    }

}

 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java

@@ -1201,4 +1201,7 @@
    }


    public List<BasicDataProduce> selectEquipmentByProcessSv(String process) {
       return reportingWorkMapper.SelectWorkBasicDeviceMp(process);
    }
}

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

@@ -250,7 +250,7 @@
        select
        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,
        d.processing_note,d.contract_id
        d.processing_note,d.contract_id,d.delivery_date
        from sd.`order` d
        <where>
            <if test="orderDetail.orderId != null and orderDetail.orderId != ''">