第三方单据bug修复

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

@@ -28,6 +28,7 @@ import com.glxp.api.entity.system.SystemParamConfigEntity;
 import com.glxp.api.entity.thrsys.ThrOrderDetailEntity;
 import com.glxp.api.entity.thrsys.ThrOrderEntity;
 import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity;
+import com.glxp.api.req.basic.FilterUdiRelRequest;
 import com.glxp.api.req.inout.*;
 import com.glxp.api.req.inv.FilterInvoiceRequest;
 import com.glxp.api.req.system.DeleteRequest;
@@ -59,10 +60,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * 单据业务详情
@@ -253,7 +251,8 @@ public class IoOrderDetailBizController extends BaseController {
         orderEntity.setUpdateUser(authAdmin.getId() + "");
         orderEntity.setUpdateTime(new Date());
         orderEntity.setCustomerId(authAdmin.getCustomerId() + "");
-        orderEntity.setCorpOrderId(thrOrderEntity.getBillNo());
+        long random = Calendar.getInstance().getTimeInMillis();
+        orderEntity.setCorpOrderId(random+"");
         orderEntity.setAction(bussinessTypeEntity.getAction());
         orderEntity.setMainAction(bussinessTypeEntity.getMainAction());
         orderEntity.setFromThrBillNo(thrOrderEntity.getBillNo());
@@ -312,7 +311,7 @@ public class IoOrderDetailBizController extends BaseController {
                 }
                 ioOrderDetailBizEntity.setSupId(udiRelevanceResponse.getCustomerId() + "");
             } else {
-                ioOrderDetailBizEntity.setCoName(thrOrderDetailEntity.getCorpName());
+                ioOrderDetailBizEntity.setCoName(thrOrderDetailEntity.getProductName());
                 ioOrderDetailBizEntity.setCertCode(thrOrderDetailEntity.getZczbhhzbapzbh());
                 ioOrderDetailBizEntity.setYlqxzcrbarmc(thrOrderDetailEntity.getYlqxzcrbarmc());
                 ioOrderDetailBizEntity.setManufacturer(thrOrderDetailEntity.getManufactory());
@@ -321,7 +320,7 @@ public class IoOrderDetailBizController extends BaseController {
                 if (udiRelevanceEntities.size() > 1) {
                     String bindRlIds = "";
                     for (UdiRlSupResponse temp : udiRelevanceEntities) {
-                        bindRlIds = bindRlIds + "," + temp.getId();
+                        bindRlIds = bindRlIds + "," + temp.getRlId();
                     }
                     ioOrderDetailBizEntity.setBindRlIds(bindRlIds.substring(1));
                 }
@@ -547,10 +546,16 @@ public class IoOrderDetailBizController extends BaseController {
 
 
         IoOrderDetailBizEntity orderDetailBizEntity = orderDetailBizService.selectById(bizBindUpdateRequest.getId());
-
+        FilterUdiRelRequest filterUdiRelRequest=new FilterUdiRelRequest();
+        filterUdiRelRequest.setId(bizBindUpdateRequest.getBindRlFk());
+        UdiRelevanceResponse udiRelevanceResponse=udiRelevanceService.selectOneUdi(filterUdiRelRequest);
 
         if (bizBindUpdateRequest.getBindRlFk() != null)
             orderDetailBizEntity.setBindRlFk(bizBindUpdateRequest.getBindRlFk());
+        if(udiRelevanceResponse!=null){
+            orderDetailBizEntity.setNameCode(udiRelevanceResponse.getNameCode());
+            orderDetailBizEntity.setUuidFk(udiRelevanceResponse.getUuid());
+        }
         if (StrUtil.isNotEmpty(bizBindUpdateRequest.getSupId())) {
             orderDetailBizEntity.setSupId(bizBindUpdateRequest.getSupId());
         }