5. 工厂生产管理

watero-rst-core/src/main/java/com.iamberry.rst.core/tools/LogisticsInfo.java

@@ -27,6 +27,7 @@ public class LogisticsInfo implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date endDate;                   //结束时间
+    private Integer logisticsIsSynchronous;//是否可同步物流信息 1是 2否
 
     public Integer getLogisticsId() {
         return logisticsId;
@@ -115,4 +116,12 @@ public class LogisticsInfo implements Serializable {
     public void setEndDate(Date endDate) {
         this.endDate = endDate;
     }
+
+    public Integer getLogisticsIsSynchronous() {
+        return logisticsIsSynchronous;
+    }
+
+    public void setLogisticsIsSynchronous(Integer logisticsIsSynchronous) {
+        this.logisticsIsSynchronous = logisticsIsSynchronous;
+    }
 }

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

@@ -264,6 +264,7 @@
       csc.small_class_name,
       t.type_name,
       a.admin_name,
+      qd.describe_title,
       sc.company_name,
       si.store_name,
       v.visit_status,
@@ -456,7 +457,7 @@
       <if test="sendLogisticsNo != null and sendLogisticsNo != ''">
         AND  (
                 cc.relationSendLogisticsNo =  #{sendLogisticsNo} OR
-                sss.sendback_logistics_no  =  #{sendLogisticsNo} OR
+                ri.signclosed_logistics_number  =  #{sendLogisticsNo} OR
                 soi.sales_post_num = #{sendLogisticsNo}
               )
       </if>

watero-rst-service/src/main/java/com/iamberry/rst/service/order/mapper/logisticsInfoMapper.xml

@@ -9,6 +9,8 @@
         <result    column="logistics_onehundred_code"    property="logisticsOnehundredCode" />
         <result    column="logistics_reamk"    property="logisticsReamk" />
         <result    column="create_date"    property="createDate" />
+        <result    column="logistics_is_lash_single"    property="logisticsIsLashSingle" />
+        <result    column="logistics_is_synchronous"    property="logisticsIsSynchronous" />
     </resultMap>
     <sql    id="Base_List" >
         t.logistics_id,
@@ -18,7 +20,8 @@
         t.logistics_onehundred_code,
         t.logistics_reamk,
         t.create_date,
-        t.logistics_is_lash_single
+        t.logistics_is_lash_single,
+        t.logistics_is_synchronous
     </sql>
     <select id="getLogisticsInfoList" resultMap="BaseResultMap" parameterType="LogisticsInfo" >
         select

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

@@ -602,18 +602,23 @@ public class MQTask implements InitializingBean {
             LogisticsInfo log = new LogisticsInfo();
             log.setLogisticsRstCode(salesOrder.getSalesPostFirm());
             List<LogisticsInfo> listlog = logisticsInfoService.getLogisticsInfoList(log);
-            // 调用第三方接口查询物流信息
-            Date date = kuaidi100.selectCourierSignCaseTime(listlog.get(0),salesOrder.getSalesPostNum());
-            if(date == null){
-                continue;
-            }
-            // 编辑订单的揽件时间
-            SalesOrder so = new SalesOrder();
-            so.setSalesId(salesOrder.getSalesId());
-            so.setOrderCaseDate(date);
-            if(salesOrderService.update(so) <= 0){
-                logger.info("修改揽件时间异常，订单号："+salesOrder.getSalesOrderId());
-            }
+            if(listlog.size() > 0){
+            	if(listlog.get(0).getLogisticsIsSynchronous() == 1){
+					// 调用第三方接口查询物流信息
+					Date date = kuaidi100.selectCourierSignCaseTime(listlog.get(0),salesOrder.getSalesPostNum());
+					if(date == null){
+						continue;
+					}
+					// 编辑订单的揽件时间
+					SalesOrder so = new SalesOrder();
+					so.setSalesId(salesOrder.getSalesId());
+					so.setOrderCaseDate(date);
+					if(salesOrderService.update(so) <= 0){
+						logger.info("修改揽件时间异常，订单号："+salesOrder.getSalesOrderId());
+					}
+				}
+			}
+
         }
 	}