审批系统修改

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

@@ -119,6 +119,8 @@ public class SalesOrder implements Serializable {
 
     private Integer isCustmerAddOrder;  //是否是客诉添加的订单  1：是   2：不是  只用于查询，不用于添加修改，为2查询所有不是客诉的订单
 
+    private Date salesDistributionTime;//通知配货时间
+
     public Integer getStartOrderNO() {
         return startOrderNO;
     }
@@ -694,4 +696,12 @@ public class SalesOrder implements Serializable {
     public void setIsCustmerAddOrder(Integer isCustmerAddOrder) {
         this.isCustmerAddOrder = isCustmerAddOrder;
     }
+
+    public Date getSalesDistributionTime() {
+        return salesDistributionTime;
+    }
+
+    public void setSalesDistributionTime(Date salesDistributionTime) {
+        this.salesDistributionTime = salesDistributionTime;
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/mapper/approvalOrderMapper.xml

@@ -355,7 +355,7 @@
         AND hr.record_state  = 1
       </if>
       <if test="selectState != null and selectState != '' and selectState == 2">
-        AND hr.record_state  = 2
+        AND ai.approval_status in (2,3,4,5,6,7,8,10,11)
       </if>
       <if test="selectState != null and selectState != '' and selectState == 3">
         AND ai.approval_status in (2,6)

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

@@ -1215,7 +1215,8 @@
         update tb_rst_sales_order_info
         SET
           sales_shipping_status = #{salesShippingStatus},
-          sales_orderId = #{salesOrderId}
+          sales_orderId = #{salesOrderId},
+          sales_distribution_time = NOW()
         WHERE
           sales_shipping_status = 0
         AND
@@ -1418,6 +1419,14 @@
                     AND sales_deliver_time <![CDATA[<=]]> #{endDate}
                 </if>
             </if>
+            <if test="orderDateType != null and orderDateType == 4">
+                <if test="startDate != null and startDate != ''">
+                    AND sales_distribution_time <![CDATA[>=]]> #{startDate}
+                </if>
+                <if test="endDate != null and endDate != ''">
+                    AND sales_distribution_time <![CDATA[<=]]> #{endDate}
+                </if>
+            </if>
         </where>
         GROUP BY tb_rst_sales_order_info.sales_id
         ORDER BY tb_rst_sales_order_info.sales_id DESC

watero-rst-web/src/main/java/com/iamberry/rst/controllers/approval/ApprovalController.java

@@ -361,7 +361,9 @@ public class ApprovalController {
             if(selectType == 1){//我发起的
                 approvalInfo.setAdminId(admin.getAdminId());
             }else if(selectType == 2){//我审核的
-                approvalInfo.setApprovalAdminId(admin.getAdminId());
+                if(approvalInfo.getSelectState() == null || approvalInfo.getSelectState() != 2){
+                    approvalInfo.setApprovalAdminId(admin.getAdminId());
+                }
             }
             if(selectType == 3){
                 //判断是否是仓库人员

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

@@ -75,6 +75,7 @@
         <#--<th width="40">客户备注</th>-->
             <th width="40">后台备注</th>
             <th width="40">下单时间</th>
+            <th width="40">通知配货时间</th>
             <th width="60">操作</th>
         </tr>
         </thead>
@@ -163,6 +164,7 @@
             <#--<td>${(o.salesUserRemark)!}</td>-->
                 <td>${(o.salesAdminRemark)!}</td>
                 <td>${(o.salesCreateTime?string("yyyy-MM-dd"))!}</td>
+                <td><#if (o.salesPostFirm)??>${(o.salesDistributionTime?string("yyyy-MM-dd"))!}</#if></td>
                 <td class="td-manage">
                     <#if o.salesShippingStatus == 11>
                         <a title="打单发货" href="javascript:window.location.href='${path}/admin/await_send/printOrderUI?orderId=${o.salesId}'" class="ml-5" style="text-decoration:none;display:inline">打单发货</a><br>

watero-rst-web/src/main/webapp/WEB-INF/views/order/statistics/order_statistics.ftl

@@ -86,6 +86,7 @@
                     <option value="1" <#if salesOrder.orderDateType??><#if salesOrder.orderDateType == 1 >selected="selected"</#if></#if>>创建时间</option>
                     <option value="2" <#if salesOrder.orderDateType??><#if salesOrder.orderDateType == 2 >selected="selected"</#if></#if>>打单时间</option>
                     <option value="3" <#if salesOrder.orderDateType??><#if salesOrder.orderDateType == 3 >selected="selected"</#if></#if>>出库时间</option>
+                    <option value="4" <#if salesOrder.orderDateType??><#if salesOrder.orderDateType == 4 >selected="selected"</#if></#if>>通知配货时间</option>
                 </select>
 
             </div>