Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -317,7 +317,11 @@ public class IoOrderController extends BaseController {
                 basicCorpEntity.setId(IdUtil.getSnowflakeNextId());
                 basicCorpService.insert(basicCorpEntity);
             }
+            if (addOrderRequest.getAction().equals(bussinessTypeEntity.getAction())){
+                orderEntity.setFromCorp(basicCorpEntity.getName());
+            }else {
                 orderEntity.setFromCorp(basicCorpEntity.getErpId());
+            }
         } else {
             orderEntity.setFromCorp(addOrderRequest.getFromCorp());
         }

src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java

@@ -36,7 +36,6 @@ import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
 import com.glxp.api.res.basic.UdiRlSupResponse;
 import com.glxp.api.res.inout.IoOrderDetailBizResponse;
-import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
 import com.glxp.api.res.inout.IoOrderDetailResultResponse;
 import com.glxp.api.res.inout.IoOrderInvoiceResponse;
 import com.glxp.api.service.auth.InvWarehouseService;
@@ -184,7 +183,6 @@ public class IoOrderDetailBizController extends BaseController {
             ioOrderDetailBizEntity.setUuidFk(udiRelevanceResponse.getUuid());
             ioOrderDetailBizEntity.setNameCode(udiRelevanceResponse.getNameCode());
             ioOrderDetailBizEntity.setCoName(udiRelevanceResponse.getCpmctymc());
-            ioOrderDetailBizEntity.setCertCode(addBizProductReqeust.getZczbhhzbapzbh());
             ioOrderDetailBizEntity.setYlqxzcrbarmc(udiRelevanceResponse.getYlqxzcrbarmc());
             ioOrderDetailBizEntity.setManufacturer(udiRelevanceResponse.getManufactory());
             ioOrderDetailBizEntity.setMeasname(udiRelevanceResponse.getMeasname());
@@ -194,7 +192,12 @@ public class IoOrderDetailBizController extends BaseController {
             ioOrderDetailBizEntity.setExpireDate(item.getExpireDate());
             ioOrderDetailBizEntity.setBatchNo(item.getBatchNo());
             ioOrderDetailBizEntity.setSupId(item.getSupId());
+            if(null == addBizProductReqeust.getZczbhhzbapzbh() || "".equals(addBizProductReqeust.getZczbhhzbapzbh())){
                 ioOrderDetailBizEntity.setCertCode(udiRelevanceResponse.getZczbhhzbapzbh());
+            }else{
+                ioOrderDetailBizEntity.setCertCode(addBizProductReqeust.getZczbhhzbapzbh());
+            }
+
             orderDetailBizService.insert(ioOrderDetailBizEntity);
         }
 

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

@@ -187,7 +187,15 @@ public class PurOrderController {
                 }
                 purOrderService.deleteById(id);
                 purOrderDetailService.deleteByOrderId(id + "");
-            } else {
+            }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/res/inout/IoOrderResponse.java

@@ -253,6 +253,8 @@ public class IoOrderResponse {
             return fromCorpName;
         if (StrUtil.isNotEmpty(fromInvName))
             return fromInvName;
+        if (StrUtil.isNotEmpty(fromCorp))
+            return fromCorp;
         return fromName;
     }