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

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());
-            ioOrderDetailBizEntity.setCertCode(udiRelevanceResponse.getZczbhhzbapzbh());
+            if(null == addBizProductReqeust.getZczbhhzbapzbh() || "".equals(addBizProductReqeust.getZczbhhzbapzbh())){
+                ioOrderDetailBizEntity.setCertCode(udiRelevanceResponse.getZczbhhzbapzbh());
+            }else{
+                ioOrderDetailBizEntity.setCertCode(addBizProductReqeust.getZczbhhzbapzbh());
+            }
+
             orderDetailBizService.insert(ioOrderDetailBizEntity);
         }