Merge remote-tracking branch 'origin/dev' into dev2.0

src/main/java/com/glxp/api/controller/purchase/PurOrderController.java

@@ -187,6 +187,14 @@ public class PurOrderController {
                 }
                 purOrderService.deleteById(id);
                 purOrderDetailService.deleteByOrderId(id + "");
+            }else if (purOrderDetailMap.size() == 1) {
+                //判断要是往来单位是空的就从详情里面取
+                if(StrUtil.isBlank(purOrderEntity.getSupId())){
+                    for (String key : purOrderDetailMap.keySet()) {
+                        purOrderEntity.setSupId(key);
+                    }
+                }
+                purOrderService.update(purOrderEntity);
             }else{
                 purOrderService.update(purOrderEntity);
             }

src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java

@@ -1,6 +1,5 @@
 package com.glxp.api.entity.basic;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.util.Date;

src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java

@@ -316,7 +316,7 @@ public class ThrOrdersDlService {
                 for (ThrOrderResponse erpOrderResponse : erpOrderResponses) {
                     ThrOrderEntity thrOrderEntity = new ThrOrderEntity();
                     BeanUtils.copyProperties(erpOrderResponse, thrOrderEntity);
-                    ThrOrderEntity originEntity = thrOrderService.findByUnique(thrOrderEntity.getBillNo(), thrOrderEntity.getThirdSysFk());
+                    ThrOrderEntity originEntity = thrOrderService.findByUnique(thrOrderEntity.getBillNo(), thirdSys);
                     if (originEntity != null) {
                         thrOrderService.deleteById(originEntity.getId() + "");
                         thrOrderDetailService.deleteByOrderIdFk(originEntity.getBillNo() + "");
@@ -352,6 +352,7 @@ public class ThrOrdersDlService {
         }
         return -1;
     }
+
     public List<ThrOrderResponse> getThrOrders(FilterThrOrderRequest filterThrOrderRequest) {
         ThrSystemDetailEntity thrSystemDetailEntity = thrSystemDetailService.selectByKey("orderQueryUrl", filterThrOrderRequest.getThirdSysFk());
         int page = 1;

src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java

@@ -34,7 +34,6 @@ import java.util.List;
 
 @Slf4j
 @Service
-@Transactional(rollbackFor = Exception.class)
 public class ThrOrderServiceImpl implements ThrOrderService {
     @Resource
     private ThrOrderDao thrOrderDao;
@@ -168,26 +167,31 @@ public class ThrOrderServiceImpl implements ThrOrderService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean insertThrOrder(ThrOrderEntity thrCorpEntity) {
         return thrOrderDao.insertThrOrder(thrCorpEntity);
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean insertThrOrders(List<ThrOrderEntity> thrOrderEntities) {
         return thrOrderDao.insertThrOrders(thrOrderEntities);
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public int updateThrOrder(ThrOrderEntity thrOrderEntity) {
         return thrOrderDao.updateById(thrOrderEntity);
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean deleteById(String id) {
         return thrOrderDao.deleteById(id);
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean deleteAll() {
         return thrOrderDao.deleteAll();
     }