Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

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

@@ -160,6 +160,9 @@
                 <if test="salesWarehouseId != null ">
                     AND sales_warehouse_id = #{salesWarehouseId}
                 </if>
+                <if test="salesIsSublist != null  and salesIsSublist !=''">
+                    AND sales_is_sublist = #{salesIsSublist}
+                </if>
             </where>
             GROUP BY
             soi.sales_id
@@ -295,7 +298,6 @@
         LEFT JOIN tb_rst_sales_order_item oi ON tb_rst_sales_order_info.sales_id = oi.item_order_id
         <where>
             tb_rst_sales_order_info.sales_batch_id != 'KS00000000000001'
-            AND sales_is_sublist = 1
             <if test="salesIsDownload !=null and salesIsDownload !=''">
                 AND sales_is_download = #{salesIsDownload}
             </if>
@@ -375,7 +377,9 @@
             <if test="salesWarehouseId != null ">
                 AND sales_warehouse_id = #{salesWarehouseId}
             </if>
-
+            <if test="salesIsSublist != null  and salesIsSublist !=''">
+                AND sales_is_sublist = #{salesIsSublist}
+            </if>
         </where>
         GROUP BY tb_rst_sales_order_info.sales_id
         ORDER BY sales_create_time DESC

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminSalesOrderController.java

@@ -977,6 +977,7 @@ public class AdminSalesOrderController {
                 salesOrderItem.setItemIsSource(1);
                 //---- updata new add
                 salesOrderItem.setItemOrderId(salesOrder.getSalesId());
+                salesOrderItem.setItemCostTotal(salesOrderItem.getItemCost() * salesOrderItem.getItemNum());
             }else{
                 return  new ResponseJson(500, "添加商品错误", 500);
             }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -106,6 +106,7 @@ public class AwaitSendController {
         }
         salesOrder.setSalesWarehouseId(orderWarehouse.getWarehouseId());
         salesOrder.setSalesStatus(1);
+        salesOrder.setSalesIsSublist(1);//不查询子订单
         PagedResult<SalesOrder> pagedResult = salesOrderService.listAwaitSendSalesOrderPage(pageNO, pageSize, salesOrder,totalNum == 0);
         if (totalNum != 0) {
             pagedResult.setTotal(totalNum);
@@ -178,6 +179,7 @@ public class AwaitSendController {
         salesOrder.setSalesWarehouseId(orderWarehouse.getWarehouseId());
         // 查询确认的订单
         salesOrder.setSalesStatus(1);
+        salesOrder.setSalesIsSublist(1);//不查询子订单
         PagedResult<SalesOrder> pagedResult = salesOrderService.listSalesOrderPage(1, pageSize, salesOrder, false);
         // 待发货产品总数
         int waitProductTotal = 0;

watero-rst-web/src/main/webapp/WEB-INF/views/cm/question/question_list.ftl

@@ -60,6 +60,8 @@
                 <option value="4" <#if complaintQuestionInfo.detectComplaintType??><#if complaintQuestionInfo.detectComplaintType == 4 >selected="selected"</#if></#if>>软水机</option>
                 <option value="5" <#if complaintQuestionInfo.detectComplaintType??><#if complaintQuestionInfo.detectComplaintType == 5 >selected="selected"</#if></#if>>果蔬机</option>
                 <option value="6" <#if complaintQuestionInfo.detectComplaintType??><#if complaintQuestionInfo.detectComplaintType == 6 >selected="selected"</#if></#if>>净水龙头</option>
+                <option value="7" <#if complaintQuestionInfo.detectComplaintType??><#if complaintQuestionInfo.detectComplaintType == 7 >selected="selected"</#if></#if>>空气净化器</option>
+                <option value="8" <#if complaintQuestionInfo.detectComplaintType??><#if complaintQuestionInfo.detectComplaintType == 8 >selected="selected"</#if></#if>>热水机</option>
             </select>
 
             <select class="my-select" name="questionIsQcDetect" id="questionIsQcDetect" style="height: 36px;width: 132px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
@@ -114,6 +116,10 @@
                                     果蔬机
                                 <#elseif question.detectComplaintType == 6>
                                     净水龙头
+                                <#elseif question.detectComplaintType == 7>
+                                    空气净化器
+                                <#elseif question.detectComplaintType == 8>
+                                    热水机
                                 </#if>
                             </td>
                             <td>${question.complaintClassName!''}</td>

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

@@ -250,10 +250,10 @@
                 </div>
                 <label class="form-label col-2 col-sm-2">实付金额：</label>
                 <div class="formControls col-2 col-sm-2">
-                    <input type="text" class="input-text" value="0" placeholder="实付金额" datatype="*" errormsg="必须要输入总金额！" id="salesPayMoneyTest" name="salesPayMoneyTest"  >
+                    <input type="text" class="input-text" value="0" placeholder="实付金额" datatype="*" errormsg="必须要输入实付金额！" id="salesPayMoneyTest" name="salesPayMoneyTest"  >
                 </div>
                 <div class="formControls col-2 col-sm-2" style="display: none">
-                    <input type="text" class="input-text" value="0" placeholder="优惠金额" datatype="*" errormsg="必须要输入总金额！" id="salesDiscountMoneyTest" name="salesDiscountMoneyTest"  >
+                    <input type="text" class="input-text" value="0" placeholder="优惠金额" datatype="*" errormsg="必须要输入优惠金额！" id="salesDiscountMoneyTest" name="salesDiscountMoneyTest"  >
                 </div>
 
                 <div class="formControls col-2 col-sm-2">

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

@@ -229,6 +229,7 @@
                                 <th style="text-align: center;" width="25" >产品颜色</th>
                                 <th style="text-align: center;" width="10">原价</th>
                                 <th style="text-align: center;" width="10">售价</th>
+                                <th style="text-align: center;" width="10">成本价</th>
                                 <th style="text-align: center;" width="25">产品编码</th>
                                 <th style="text-align: center;" width="10">数量</th>
                                 <th style="text-align: center;" width="10">小结</th>
@@ -243,6 +244,7 @@
                                     <td>${item.itemProductColor}</td>
                                     <td style="width: 40px;"><input type="text" class="input-text input-number color_price decimal_input" style="text-align: center;" value="${((item.itemProductPrice/100)?string("0.##"))!''}"  name="" id="" placeholder="售价" onkeyup="keyFunDecimal($(this),9999999,0)" myMinVal="0" myMaxVal="9999999"></td>
                                     <td style="width: 40px;"><input type="text" class="input-text input-number color_discount decimal_input" style="text-align: center;" value="${((item.itemProductDiscount/100)?string("0.##"))!''}"  name="" id="" placeholder="售价" onkeyup="keyFunDecimal($(this),9999999,0)" myMinVal="0" myMaxVal="9999999"></td>
+                                    <td style="width: 40px;"><input type="text" class="input-text input-number item_cost decimal_input" style="text-align: center;" value="${((item.itemCost/100)?string("0.##"))!''}"  name="" id="" placeholder="成本价" onkeyup="keyFunDecimal($(this),9999999,0)" myMinVal="0" myMaxVal="9999999"></td>
                                     <td>${item.itemColorBar}</td>
                                     <td style="width: 30px;">
                                         <input type="text"

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

@@ -104,6 +104,9 @@ $(function(){
                 orderItem.itemNum = $(this).find(".item-num").val();
                 orderItem.itemProductPrice = accMul($(this).find(".color_price").val(),100);
                 orderItem.itemProductDiscount = accMul($(this).find(".color_discount").val(),100);
+                if($(this).find(".item_cost").val() != null ){
+                    orderItem.itemCost = accMul($(this).find(".item_cost").val(),100);
+                }
                 orderItem.itemTotal = accMul($(this).find(".item_total").val(),100);
                 orderItemArray.push(orderItem);
                 flag = true;