订单添加成本

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

@@ -486,6 +486,8 @@
             item_product_discount,
             item_is_source,
             item_total,
+              item_cost,
+              item_cost_total,
             item_create_time,
             pi.product_abbreviation,
             pc.color_abbreviation,

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_detail.ftl

@@ -75,13 +75,6 @@
         <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
             <thead>
             <tr>
-                <th width="10">批次号：</th>
-                <td width="10" style="font-weight: normal;"><span>${order.salesBatchId!'暂无批次'}</span></td>
-                <td width="10"></td>
-                <th width="10">下单日期：</th>
-                <td width="10" style="font-weight: normal;"><span>${(order.batchCreateTime?string("yyyy-MM-dd HH:mm:ss"))!''}</span></td>
-            </tr>
-            <tr>
                 <th width="10">订单编号：</th>
                 <td width="10" style="font-weight: normal;"><span>${order.salesOrderId!'暂无订单编号'}</span></td>
                 <td width="10"></td>
@@ -89,6 +82,13 @@
                 <td width="10" style="font-weight: normal;"><span>${order.salesDealCode!''}</span></td>
             </tr>
             <tr>
+                <th width="10">订单ID：</th>
+                <td width="10" style="font-weight: normal;"><span>${order.salesId!''}</span></td>
+                <td width="10"></td>
+                <th width="10">批次号：</th>
+                <td width="10" style="font-weight: normal;"><span>${order.salesBatchId!'暂无批次'}</span></td>
+            </tr>
+            <tr>
                 <th width="10">销售公司：</th>
                 <td width="10" style="font-weight: normal;"><span>${order.companyName!''}</span></td>
                 <td width="10"></td>
@@ -131,8 +131,8 @@
                 <td width="10" style="font-weight: normal;">${order.salesAdminName!''}</td>
 
                 <td width="10"></td>
-                <th width="10"></th>
-                <td width="10" style="font-weight: normal;"><span></span></td>
+                <th width="10">下单日期：</th>
+                <td width="10" style="font-weight: normal;"><span>${(order.batchCreateTime?string("yyyy-MM-dd HH:mm:ss"))!''}</span></td>
             </tr>
             </thead>
         </table>
@@ -153,6 +153,9 @@
                         <#--<th>产品图片</th>-->
                         <th>产品市场价（￥）</th>
                         <th>产品折扣价（￥）</th>
+                        <th>小结（￥）</th>
+                        <th>成本（￥）</th>
+                        <th>成本小结（￥）</th>
                         <th>未退货数量</th>
                         <th>已退货数量</th>
                         <th>产品总数</th>
@@ -163,8 +166,11 @@
                                 <td>${item.itemProductName!''}</td>
                                 <td>${item.itemProductColor!''}</td>
                                 <#--<td>${item.itemProductPic!''}</td>-->
-                                <td>${item.itemProductPrice/100!''}</td>
-                                <td>${item.itemProductDiscount/100!''}</td>
+                                <td>${((item.itemProductPrice/100)?string("0.##"))!''}</td>
+                                <td>${((item.itemProductDiscount/100)?string("0.##"))!''}</td>
+                                <td>${((item.itemTotal/100)?string("0.##"))!''}</td>
+                                <td>${((item.itemCost/100)?string("0.##"))!''}</td>
+                                <td>${((item.itemCostTotal/100)?string("0.##"))!''}</td>
                                 <td>${item.itemNum-item.itemReturnNum}</td>
                                 <td>${item.itemReturnNum}</td>
                                 <td>${item.itemNum}</td>

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_list.ftl

@@ -399,7 +399,7 @@
      */
     function sales_order_detail(orderSaleId) {
         //window.location.href= "${path}/admin/salesOrder/select_sales_order?salesId="+orderSaleId;
-        layer_show("订单详情","${path}/admin/salesOrder/select_sales_order?salesId="+orderSaleId,800,600);
+        layer_show_norm("订单详情","${path}/admin/salesOrder/select_sales_order?salesId="+orderSaleId,6);
     }
 
     /*手动发货*/

watero-rst-web/src/main/webapp/WEB-INF/views/product/add_product.ftl

@@ -157,6 +157,7 @@
                     <table class="table table-border table-bg table-bordered" style="margin-top: 10px;" id="all_add_product">
                         <thead>
                             <tr class="text-c" id="table1">
+                                <th  width="10" >颜色ID</th>
                                 <th style="text-align: center;" width="30" ><span class="c-red">*</span>颜色名称</th>
                                 <th style="text-align: center;" width="30" ><span class="c-red">*</span>颜色简称</th>
                                 <th style="text-align: center;" width="10">售价</th>

watero-rst-web/src/main/webapp/WEB-INF/views/product/update_product.ftl

@@ -159,6 +159,7 @@
                     <table class="table table-border table-bg table-bordered" style="margin-top: 10px;" id="all_add_product">
                         <thead>
                         <tr class="text-c" id="table1">
+                            <th  width="10" >颜色ID</th>
                             <th  width="30" ><span class="c-red">*</span>颜色名称</th>
                             <th  width="30" ><span class="c-red">*</span>颜色简称</th>
                             <th  width="10">售价</th>
@@ -179,6 +180,7 @@
                                     <tr class="text-c">
                                         <input type="hidden" class="colorId" value="${productColor.colorId!''}">
                                         <input type="hidden" class="isUpdate" value="2">
+                                        <td width="30" class="colorIdHtml">${productColor.colorId!''}</td>
                                         <td width="30" class="colorName">${productColor.colorName!''}</td>
                                         <td width="30" class="colorAbbreviation">${productColor.colorAbbreviation!''}</td>
                                         <td width="10" class="colorDiscount">${((productColor.colorDiscount/100)?string("0.##"))!''}</td>

watero-rst-web/src/main/webapp/common/js/common/common.js

@@ -262,6 +262,9 @@ function layer_show_norm(name,url,type) {
         case 5:
             w=1000;h=570;
             break;
+        case 6:
+            w=1100;h=600;
+            break;
         default:
             break
     }

watero-rst-web/src/main/webapp/common/js/product/product.js

@@ -20,6 +20,7 @@ function add_color(isUpdate){
         var colorHtml = '<tr class="text-c">' +
             '<input type="hidden" class="colorId" name="" id="" value="'+ colorId +'">'+
             '<input type="hidden" class="isUpdate" name="" id="" value="'+ isUpdate +'">';
+        colorHtml += '<td width="40" class="colorIdHtml">-</td>';
         colorHtml += '<td width="40" class="colorName">'+$node.find(".colorName").val()+'</td>';
         colorHtml += '<td width="40" class="colorAbbreviation">'+$node.find(".colorAbbreviation").val()+'</td>';
         colorHtml += '<td width="40" class="colorDiscount">'+$node.find(".colorDiscount").val()+'</td>';
@@ -72,6 +73,9 @@ function add_color(isUpdate){
             if($(this).find(".colorId").val() == colorId){
                 noHaveColorId = false;
                 $(this).find(".isUpdate").val(1);
+                if(colorId.indexOf(update_color_id_suff) < 0){
+                    $(this).find(".colorIdHtml").html(colorId);
+                }
                 $(this).find(".colorName").html($node.find(".colorName").val());
                 $(this).find(".colorAbbreviation").html($node.find(".colorAbbreviation").val());
                 $(this).find(".colorDiscount").html($node.find(".colorDiscount").val());