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-core/src/main/java/com.iamberry.rst.core/tools/KuaiDi100.java

@@ -442,11 +442,11 @@ public class KuaiDi100 {
      * @param code
      * @return
      */
-    public JSONObject selectCourierCompany2(String code,String num) {
+    public JSONObject selectCourierCompany2(LogisticsInfo logisticsInfo,String num) {
         // 调用百度的接口
         try {
-            String temp = logisticsConversions(code.toLowerCase());
-            String baiduURL = "https://sp0.baidu.com/9_Q4sjW91Qh3otqbppnN2DJv/pae/channel/data/asyncqury?cb=cb&appid=4001&nu="+num+"&com="+temp;
+            /*String temp = logisticsConversions(code.toLowerCase());*/
+            String baiduURL = "https://sp0.baidu.com/9_Q4sjW91Qh3otqbppnN2DJv/pae/channel/data/asyncqury?cb=cb&appid=4001&nu="+num+"&com="+logisticsInfo.getLogisticsOnehundredCode();
             String result = HttpClient431Util.doGet2(null, baiduURL,"BAIDUID=E157C876272626E1F7F498C10A6A3F00:FG=1");
             String content = result.substring(7, result.length());
             content = content.substring(0, content.length()-1);
@@ -460,7 +460,7 @@ public class KuaiDi100 {
         }
         // 调用快递鸟的接口
         try {
-            String result = selectCourierSF(code, num);
+            String result = selectCourierSF(logisticsInfo.getLogisticsRstCode(), num);
             JSONObject jn = JSONObject.fromObject(result);
             if (result != null && jn.getInt("State") != 0) {
                 SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -496,10 +496,10 @@ public class KuaiDi100 {
      * @param code
      * @return
      */
-    public Date selectCourierSignTime(String code, String num){
+    public Date selectCourierSignTime(LogisticsInfo logisticsInfo, String num){
         JSONObject json = null;
         for(int i = 0; i < 3; i++){
-            json = selectCourierCompany2(code,num);
+            json = selectCourierCompany2(logisticsInfo,num);
             if(json.getString("status").equals("0")){
                 break;
             }
@@ -526,14 +526,14 @@ public class KuaiDi100 {
     /**
      * 百度快递查询签收时间 - 查询揽件时间
      * 根据物流单号查询快递信息 state 0在途，1揽收，2疑难，3签收，4退签，5派件，6退回
-     * @param code
+     * @param
      * @return
      */
-    public Date selectCourierSignCaseTime(String code, String num){
+    public Date selectCourierSignCaseTime(LogisticsInfo logisticsInfo, String num){
         JSONObject json = null;
         boolean flag = false;
         for(int i = 0; i < 3; i++){
-            json = selectCourierCompany2(code,num);
+            json = selectCourierCompany2(logisticsInfo,num);
             if (json == null) {
                 break;
             }

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/ComplaintSignclosedInfoServiceImpl.java

@@ -652,7 +652,7 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
             LogisticsInfo log = new LogisticsInfo();
             log.setLogisticsRstCode(signclosedInfo.getSignclosedLogistics());
             List<LogisticsInfo> listlog = logisticsInfoService.getLogisticsInfoList(log);
-            Date signTime = kuaidi100.selectCourierSignTime(listlog.get(0).getLogisticsOnehundredCode(),signclosedInfo.getSignclosedLogisticsNumber());
+            Date signTime = kuaidi100.selectCourierSignTime(listlog.get(0),signclosedInfo.getSignclosedLogisticsNumber());
             SendbackInfo sendbackInfo = new SendbackInfo();
             sendbackInfo.setSendbackId(signclosedInfo.getSendbackId());
             sendbackInfo.setSendbackStatus(3);

watero-rst-web/src/main/java/com/iamberry/rst/controllers/kuaidi/LogisticsController.java

@@ -49,7 +49,7 @@ public class LogisticsController {
         LogisticsInfo log = new LogisticsInfo();
         log.setLogisticsRstCode(com);
         List<LogisticsInfo> listlog = logisticsInfoService.getLogisticsInfoList(log);
-        rst = kuaidi100.selectCourierCompany2(listlog.get(0).getLogisticsOnehundredCode(),nu);
+        rst = kuaidi100.selectCourierCompany2(listlog.get(0),nu);
         msg.setResultCode(ResultInfo.SUCCESSCODE);
         msg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
         msg.setData(rst);

watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/MQTask.java

@@ -603,7 +603,7 @@ public class MQTask implements InitializingBean {
             log.setLogisticsRstCode(salesOrder.getSalesPostFirm());
             List<LogisticsInfo> listlog = logisticsInfoService.getLogisticsInfoList(log);
             // 调用第三方接口查询物流信息
-            Date date = kuaidi100.selectCourierSignCaseTime(listlog.get(0).getLogisticsEfastCode(),salesOrder.getSalesPostNum());
+            Date date = kuaidi100.selectCourierSignCaseTime(listlog.get(0),salesOrder.getSalesPostNum());
             if(date == null){
                 continue;
             }

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

@@ -928,6 +928,22 @@ public class AwaitSendController {
             rj.setResultMsg("标记为未出库状态成功");
         }else{
             rj.setResultMsg("出库成功");
+            //如果为子母件则子件也需要出库
+            if(salesOrder.getSalesIsSublist() == 1){
+                List<SalesOrder> orderList = salesOrderService.listSublistCount(salesOrder.getSalesId());
+                if(orderList.size() > 0){
+                    for(SalesOrder order : orderList){
+                        order.setSalesOldDeliver(salesOrder.getSalesDeliver());
+                        order.setSalesDeliver(type);
+                        try{
+                            salesOrderService.updateDeliver(order);
+                        }catch (Exception e){
+                            rj.setResultMsg("子订单标记出库失败;</br>原因："+e.getMessage());
+                            return rj;
+                        }
+                    }
+                }
+            }
         }
         return rj;
     }

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

@@ -57,10 +57,9 @@
                     <th colspan="3" >
                         <span style="text-align:center;font-size: 1.75rem;">拣货单</span>
                         <div style="float: right;margin-top: 0.5cm">
-                            <#--<span style="margin-right: 2cm;" id="dateId1">时间：</span>-->
+                            <span style="margin-right: 2cm;" id="dateId1">时间：</span>
                             <span style="margin-right: 2cm;">仓库人员：</span>
                             <span style="margin-right: 2cm;">仓库主管：</span>
-
                         </div>
                     </th>
                 </tr>
@@ -89,8 +88,11 @@
         <table class="table2" style="margin:0 0 0.5cm 1cm;width: 19cm;border: 1px solid #000;border-collapse: collapse;text-align: left;">
             <thead style="display:table-header-group">
             <tr>
-                <th colspan="5" style="text-align:center;font-size: 1.75rem;">
-                    核对单
+                <th colspan="6" >
+                    <span style="text-align:center;font-size: 1.75rem;">核对单</span>
+                    <div style="float: right;margin-top: 0.5cm">
+                        <span style="margin-right: 2cm;" id="dateId2">时间：</span>
+                    </div>
                 </th>
             </tr>
             <tr>
@@ -138,8 +140,8 @@
                                 '</tr>';
                     });
                     $("#listid1").html(html);
-                    /*var day1 = new Date();
-                    $("#dateId1").html("打印时间："+formatDate(day1,"yyyy-MM-dd HH:mm:ss"));*/
+                    var day1 = new Date();
+                    $("#dateId1").html("打印时间："+formatDate(day1,"yyyy-MM-dd HH:mm:ss"));
                     // 选择打印设备
                     var isIE = (navigator.userAgent.indexOf('MSIE')>=0) || (navigator.userAgent.indexOf('Trident')>=0);
                     if (!isIE) {
@@ -205,7 +207,8 @@
                                 '</tr>';
                     });
                     $("#listid2").html(html);
-
+                    var day1 = new Date();
+                    $("#dateId2").html("打印时间："+formatDate(day1,"yyyy-MM-dd HH:mm:ss"));
 // 选择打印设备
                     var isIE = (navigator.userAgent.indexOf('MSIE')>=0) || (navigator.userAgent.indexOf('Trident')>=0);
                     if (!isIE) {