north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
@@ -172,7 +172,8 @@ <tr class="day-in" v-for="(items, index1) in item.DeliveryDetailList" :key="index1"> <td>{{items.order_number}}</td> <td>{{items.buildingNumber}}</td> <td colspan="1" style="font-size: 15px;font-weight: bold;">{{items.width}}x{{items.height}}</td> <td colspan="1" style="font-size: 15px;font-weight: bold;" v-if="items.other_columns!=null&&(JSON.parse(items.other_columns).S02!=null)">{{JSON.parse(items.other_columns).S02}}</td> <td colspan="1" style="font-size: 15px;font-weight: bold;" v-else>{{items.width}}x{{items.height}}</td> <td>{{items.quantity}}</td> <td>{{items.area}}</td> <td>{{items.price}}</td> north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue
@@ -150,7 +150,8 @@ <tr class="day-in" v-for="(items, index1) in item.DeliveryDetailList" :key="index1"> <td>{{items.order_number}}</td> <td>{{items.buildingNumber}}</td> <td colspan="2" style="font-size: 15px;font-weight: bold;">{{items.width}}x{{items.height}}</td> <td colspan="2" style="font-size: 15px;font-weight: bold;" v-if="items.other_columns!=null&&(JSON.parse(items.other_columns).S02!=null)">{{JSON.parse(items.other_columns).S02}}</td> <td colspan="2" style="font-size: 15px;font-weight: bold;" v-else>{{items.width}}x{{items.height}}</td> <td>{{items.quantity}}</td> <td>{{items.area}}</td> <td colspan="3">{{items.processingNote}}</td> north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet3.vue
@@ -32,6 +32,7 @@ request.post(`/Delivery/getSelectOrderPrinting`,form.value).then((res) => { if(res.code==200){ produceList.value = deepClone(res.data.data) console.log(JSON.parse(produceList.value[0].DeliveryDetailList[4].other_columns).S02) delivery.value=deepClone(res.data.delivery) money.value=deepClone(res.data.money) otherMoney1=[] @@ -161,7 +162,8 @@ <tr class="day-in" v-for="(items, index1) in item.DeliveryDetailList" :key="index1"> <td>{{items.order_number}}</td> <td>{{items.buildingNumber}}</td> <td colspan="1" style="font-size: 15px;font-weight: bold;">{{items.width}}x{{items.height}}</td> <td colspan="1" style="font-size: 15px;font-weight: bold;" v-if="items.other_columns!=null&&(JSON.parse(items.other_columns).S02!=null)">{{JSON.parse(items.other_columns).S02}}</td> <td colspan="1" style="font-size: 15px;font-weight: bold;" v-else>{{items.width}}x{{items.height}}</td> <td>{{items.quantity}}</td> <td>{{items.compute_gross_area}}</td> <td>{{items.price}}</td> north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue
@@ -305,8 +305,8 @@ <el-button @click="getTableRow(row,'edit')" v-if="userStore.user.permissions.indexOf('selectCustomer.edit') > -1" link type="primary" size="small">{{$t('basicData.edit')}}</el-button> <el-button @click="getTableRow(row,'customerOrder')" link type="primary" size="small">{{$t('customer.customerOrders')}}</el-button> <!-- <el-button @click="getTableRow(row,'customerOrder')" link type="primary" size="small">{{$t('customer.customerOrders')}}</el-button>--> <el-popconfirm @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')"> <template #reference> <el-button link type="primary" size="small">{{ $t('basicData.delete') }}</el-button> north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -378,6 +378,12 @@ selectOrder(order) }).catch((action)=>{ if(action === 'cancel'){ //重置结算面积 const dataList = xGrid.value.getTableData().fullData dataList.forEach((item,index) =>{ item.computeArea = item.area item.computeGrossArea = item.grossArea }) selectOrder(order) } @@ -1035,7 +1041,7 @@ break } default :{ areaSum = parseFloat((row.computeArea * row.quantity).toFixed(decValue)) areaSum = parseFloat((area * row.quantity).toFixed(decValue)) break } } north-glass-erp/src/main/java/com/example/erp/dto/sd/CustomerDTO.java
@@ -15,11 +15,11 @@ @ExcelProperty("发货单号") private String deliveryId; @ExcelProperty("销售单号") private String productName; @ExcelProperty("项目名称") private String orderId; @ExcelProperty("产品") @ExcelProperty("项目名称") private String project; @ExcelProperty("产品") private String productName; @ExcelProperty("数量") private Integer quantity; @ExcelProperty("面积") north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml
@@ -51,7 +51,7 @@ where date(d.create_time)>=#{startDate} and date(d.create_time) <= #{endDate} and d.customer_id = #{orderDetail.order.customerId} group by od.product_id, od.width, od.height group by od.product_id limit #{offset},#{pageSize}; </select> @@ -93,7 +93,7 @@ and date(o.create_time)>=#{startDate} and date(o.create_time) <= #{endDate} and o.customer_id = #{orderDetail.order.customerId} </where> group by od.product_id, od.width, od.height group by od.product_id limit #{offset},#{pageSize}; </select> @@ -224,34 +224,88 @@ </delete> <select id="exportSelectCustomerDeliveryDate" > select d.delivery_id,d.order_id,d.customer_id,d.customer_name, d.project,od.product_name,sum(dd.quantity) as quantity,sum(dd.area) as area,dd.price,sum(dd.money) as money, select d.delivery_id, d.order_id, d.customer_name, d.project, od.product_name, sum(dd.quantity) as quantity, sum(dd.area) as area, dd.price, sum(dd.money) as money, date(d.create_time) as create_time from sd.delivery_detail dd left join sd.delivery d on d.delivery_id = dd.delivery_id left join sd.order_detail od on od.order_id=dd.order_id and od.order_number=dd.order_number left join sd.order_detail od on od.order_id = dd.order_id and od.order_number = dd.order_number where date(d.create_time)>=#{startDate} and date(d.create_time) <= #{endDate} where date(d.create_time) >= #{startDate} and date(d.create_time) <= #{endDate} and d.customer_id = #{orderDetail.order.customerId} group by od.product_id, od.width, od.height group by od.product_id UNION ALL select d.delivery_id, o.order_id, d.customer_name, d.project, bom.alias as product_name, sum(om.quantity) as quantity, 0 as area, om.price, sum(om.money) as money, date(d.create_time) as create_time from (select * from sd.delivery_detail group by order_id) as dd left join sd.delivery d on d.delivery_id = dd.delivery_id left join sd.`order` o on o.order_id = dd.order_id left join sd.order_other_money om on om.order_id = o.order_id left join sd.basic_other_money bom on bom.`column` = om.`column` where date(d.create_time) >= #{startDate} and date(d.create_time) <= #{endDate} and d.customer_id = 1855 and om.money is not null group by d.delivery_id, o.order_id, om.`column` </select> <select id="exportSelectCustomerOderDate" > select od.order_id, o.project, od.product_name, o.customer_name, sum(od.quantity) as quantity, sum(od.area) as area, od.price, sum(od.gross_amount) as money, date(o.create_time) as create_time o.project, od.product_name, o.customer_name, sum(od.quantity) as quantity, sum(od.area) as area, od.price, sum(od.gross_amount) as money, date(o.create_time) as create_time from order_detail od left join `order` o on o.order_id = od.order_id where date(o.create_time)>=#{startDate} and date(o.create_time) <= #{endDate} and o.customer_id = #{orderDetail.order.customerId} group by od.product_id, od.width, od.height left join `order` o on o.order_id = od.order_id where date(o.create_time) >= #{startDate} and date(o.create_time) <= #{endDate} and o.customer_id = #{orderDetail.order.customerId} group by od.product_id UNION ALL select o.order_id, o.project, bom.alias as product_name, o.customer_name, sum(om.quantity) as quantity, 0 as area, om.price, sum(om.money) as money, date(o.create_time) as create_time from `order` o left join sd.order_other_money om on om.order_id = o.order_id left join sd.basic_other_money bom on bom.`column` = om.`column` where date(o.create_time) >= #{startDate} and date(o.create_time) <= #{endDate} and o.customer_id = #{orderDetail.order.customerId} and om.money is not null group by o.order_id, om.`column` </select> </mapper>
