test 审核中发布

src/main/java/com/i1/erp/deo/service/DeliveryOrderReleaseService.java

@@ -9,7 +9,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import javax.persistence.EntityManager;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
@@ -32,9 +34,14 @@ public class DeliveryOrderReleaseService implements IDeliveryOrderReleaseService
     @Autowired
     private IBaseFetchService baseFetchService;
 
+    @Autowired
+    private EntityManager entityManager;
+
     private Logger logger = LoggerFactory.getLogger(PoChgService.class);
 
+
     @Override
+    @Transactional
     public String release(String xmlStream) {
         LocalDateTime dateTime = LocalDateTime.now();
         String dateTimeString = dateTime.format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"));
@@ -44,7 +51,7 @@ public class DeliveryOrderReleaseService implements IDeliveryOrderReleaseService
             logger.info("发布送货单xmlStream:{}", xmlStream);
             Map map = baseFetchService.getMapFromXml(xmlStream);
             List<Map<String, String>> mstList = (List) map.get("mstList");
-
+            String testUid = null;
             StringBuilder stringBuilder = new StringBuilder("送货单");
             for (Map<String, String> mst : mstList) {
                 logger.info("to handle doRelease: {}", mst);
@@ -58,14 +65,20 @@ public class DeliveryOrderReleaseService implements IDeliveryOrderReleaseService
                     doMstFile.setSentToErp(true);
                     doMstFile.setSentToErpInfo("同步ERP成功");
                     doMstFileService.update(doMstFile);
+                    entityManager.refresh(doMstFile);
                     stringBuilder.append(" ");
                     stringBuilder.append(doUid);
+                    testUid = doUid;
                 } else {
                     throw new Exception("查无此送货单" + doUid);
                 }
             }
             result = Result.of(dateTimeString, "0", "", stringBuilder.append("发布成功").toString());
 
+            Optional<DoMstFile> newDoMstFileOptional = doMstFileService.findByDeliveryOrderUid(testUid);
+            DoMstFile newDoMstFile =newDoMstFileOptional.get();
+            logger.info("送货单{}发布查询:发布后发布状态{},审核状态{}", newDoMstFile.getDeliveryOrderUid(), newDoMstFile.getReleased(), newDoMstFile.getConfirm());
+
         } catch (Exception e) {
             logger.error("error:", e);
             result = Result.of(dateTimeString, "1", "", e.getMessage());

src/main/java/com/i1/erp/deo/soap/DeliveryOrderSendClient.java

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import tw.com.dsc.tiptop.tiptopservicegateway.*;
 
+import javax.persistence.EntityManager;
 import java.util.Arrays;
 import java.util.List;
 
@@ -50,6 +51,9 @@ public class DeliveryOrderSendClient extends WebServiceClient {
 
     private Logger logger = LoggerFactory.getLogger(DeliveryOrderSendClient.class);
 
+    @Autowired
+    private EntityManager entityManager;
+
     @Autowired
     private IDeliveryOrderSendService deliveryOrderSendService;
 
@@ -306,10 +310,13 @@ public class DeliveryOrderSendClient extends WebServiceClient {
     @Transactional
     public void updateConfirm(DoMstFile doMstFile, String confirm, String details) throws IOneServiceException {
         // 因为调用ERP审核的时候，ERP调用了SRM发布接口，变成了已发布，所以重新获取一下，再更新审核状态
+        entityManager.refresh(doMstFile);
         DoMstFile newDoMstFile = doMstFileService.get(doMstFile.getId());
+        entityManager.refresh(newDoMstFile);
         logger.info("送货单{}审核更新:更新前发布状态{},审核状态{}", newDoMstFile.getDeliveryOrderUid(), newDoMstFile.getReleased(), newDoMstFile.getConfirm());
         newDoMstFile.setConfirm(confirm);
         newDoMstFile.setSentToErpInfo(details);
         doMstFileService.update(newDoMstFile);
+        entityManager.refresh(newDoMstFile);
     }
 }
\ No newline at end of file