更新发货提醒备料状态的方法更新

src/main/java/com/uas/platform/b2b/core/util/SqlDateFormdateUtils.java

@@ -0,0 +1,22 @@
+package com.uas.platform.b2b.core.util;
+
+import java.text.SimpleDateFormat;
+
+/**
+ * 数据库时间格式
+ *
+ * @author hejq
+ * @date 2018-08-07 11:39
+ */
+public class SqlDateFormdateUtils {
+
+    /**
+     * 数据库 date 字段格式
+     */
+    public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd");
+
+    /**
+     * 数据库 datetime 字段格式
+     */
+    public static final SimpleDateFormat DATETIME_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+}

src/main/java/com/uas/platform/b2b/erp/service/impl/PurchaseNotifyServiceImpl.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.erp.service.impl;
 
+import com.uas.platform.b2b.core.util.SqlDateFormdateUtils;
 import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.AcceptNotify;
 import com.uas.platform.b2b.erp.model.AcceptNotifyConfirm;
@@ -99,7 +100,7 @@ public class PurchaseNotifyServiceImpl implements PurchaseNotifyService {
 					}
 					if (!existDeliveryStr.equals(deliveryStr)) {
 						existNotice.setRemark(remark + dateString + "修改交期，" + existDeliveryStr + " -> " + deliveryStr);
-                        mergeWaitingStatus(existNotice.getId());
+                        mergeWaitingStatus(existNotice.getId(), SqlDateFormdateUtils.DATE_FORMAT.format(notice.getDelivery()));
 					}
 					existNotice.setDelivery(notice.getDelivery());
 					notices.add(existNotice);
@@ -113,9 +114,10 @@ public class PurchaseNotifyServiceImpl implements PurchaseNotifyService {
      * 更新发货提醒备料状态
      *
      * @param noticeId 发货单id
+	 * @param deliveryStr 新的交货周期
      */
-    private void mergeWaitingStatus(Long noticeId) {
-        String sql = "update purc$notice,purc$orderitems set is_waiting = PURC_NOTICE_WAIT_TO_SEND(pn_delivery, coalesce(pr_ltinstock, 0)) " +
+    private void mergeWaitingStatus(Long noticeId, String deliveryStr) {
+        String sql = "update purc$notice,purc$orderitems set is_waiting = PURC_NOTICE_WAIT_TO_SEND(" + deliveryStr + ", coalesce(pr_ltinstock, 0)) " +
                 "where pn_pdid = pd_id and pn_id = " + noticeId;
         jdbcTemplate.execute(sql);
         communalLogDao.save(new CommunalLog("更新发货提醒备料状态", "通过发货提醒更新备料状态", "发货单id： " + noticeId,

src/main/java/com/uas/platform/b2b/model/ApcheckField.java

@@ -1,55 +0,0 @@
-package com.uas.platform.b2b.model;
-
-/**
- * 对账时采用的字段
- *
- * Created by hejq on 2018-05-17.
- */
-public enum ApcheckField {
-
-    /**
-     * 企业UU
-     */
-    _venduu,
-
-    /**
-     * 客户企业UU
-     */
-    _enuu,
-
-    /**
-     * 客户名称
-     */
-    en_name,
-
-    /**
-     * 开始日期
-     */
-    fromDate,
-
-    /**
-     * 截止日期
-     */
-    endDate,
-
-    /**
-     * 应付供应商
-     */
-    _receivename,
-
-    /**
-     * 送货工厂
-     */
-    _factory,
-
-    /**
-     * 物料名称
-     */
-    pr_title,
-
-    /**
-     * 物料规格
-     */
-    pr_spec
-
-}

src/main/java/com/uas/platform/b2b/service/impl/PurchaseOrderChangeServiceImpl.java

@@ -2,6 +2,7 @@ package com.uas.platform.b2b.service.impl;
 
 import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.core.util.SplitArray;
+import com.uas.platform.b2b.core.util.SqlDateFormdateUtils;
 import com.uas.platform.b2b.core.util.ThreadTask;
 import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.SaleDownChangeReply;
@@ -308,7 +309,8 @@ public class PurchaseOrderChangeServiceImpl implements PurchaseOrderChangeServic
 		SimpleDateFormat dateFormat = new SimpleDateFormat("MM月dd日");
 		if (!dateFormat.format(changItem.getNewDelivery()).equals(dateFormat.format(orderItem.getDelivery()))) {
             // 更新备料状态
-            jdbcTemplate.execute("update purc$notice,purc$orderitems set is_waiting = PURC_NOTICE_WAIT_TO_SEND(pn_delivery, coalesce(pr_ltinstock, 0)) " +
+            jdbcTemplate.execute("update purc$notice,purc$orderitems set is_waiting = PURC_NOTICE_WAIT_TO_SEND('"
+					+ SqlDateFormdateUtils.DATE_FORMAT.format(changItem.getNewDelivery()) + "', coalesce(pr_ltinstock, 0)) " +
 					"where pn_pdid = pd_id and pn_pdid = " + orderItem.getId());
             communalLogDao.save(new CommunalLog("更新发货提醒备料状态", "采购变更更新备料状态", "采购明细id： " + orderItem.getId(),
                     SystemSession.getUser().getEnterprise().getUu()));

src/main/java/com/uas/platform/b2b/task/SendNoticeTask.java

@@ -53,8 +53,10 @@ public class SendNoticeTask {
     @Scheduled(cron = "0 0 6,12 * * ? ")
     public void updateWaitingStatus() {
         // 更新备料状态
-        String sql = "update purc$notice,products,purc$orderitems set is_waiting = PURC_NOTICE_WAIT_TO_SEND(pn_delivery, coalesce(purc$orderitems.pr_ltinstock, 0 )) " +
-                "where pr_id = pd_prid and pn_pdid = pd_id and is_waiting = 1 and coalesce(pn_end, 0) <> 1 and pn_status = 200";
+        String sql = "update purc$notice " +
+                "left join purc$orderitems on pn_pdid = pd_id " +
+                "set is_waiting = purc_notice_wait_to_send(pn_delivery, coalesce(pr_ltinstock, 0)) " +
+                "where purc_notice_wait_to_send(pn_delivery, coalesce(pr_ltinstock, 0)) <> is_waiting and pn_status = 200 and is_waiting = 1";
         jdbcTemplate.update(sql);
         communalLogDao.save(new CommunalLog("更新发货提醒备料状态", "定时任务自动更新备料数据", "时间： " + sdf.format(new Date()), DEFAULT_ENUU));
     }

src/main/resources/test/sys.properties

@@ -13,7 +13,7 @@ reportUploadUrl=http://192.168.253.121:8090/report/fileUpload?userName=B2B%s
 #product service url
 ## test http://218.17.158.219:24000
 productServiceUrl=http://218.17.158.219:24000
-
+#productServiceUrl=http://10.1.51.24:8080/
 #inquiry service url
 inquiryServiceUrl=http://218.17.158.219:24000
 #inquiryServiceUrl=http://10.1.51.83:8080/